前台提交

src/main/House/build/webpack.dev.conf.js

@@ -9,6 +9,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 const portfinder = require('portfinder')
+var vConsolePlugin = require('vconsole-webpack-plugin')
 
 const HOST = process.env.HOST
 const PORT = process.env.PORT && Number(process.env.PORT)
@@ -60,7 +61,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
             from: path.resolve(__dirname, '../static'),
             to: config.dev.assetsSubDirectory,
             ignore: ['.*']
-        }])
+        }]),
+        new vConsolePlugin({ enable: true })
     ]
 })
 

src/main/House/package-lock.json

@@ -9855,6 +9855,19 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
+    "vconsole": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.2.0.tgz",
+      "integrity": "sha512-lgSoSdMOfRJCDGaiO1LXiWz4oAgIvNJpaewtEVrzCPEOKWSUOQnLYCEALseaeJsL7Pqv7A2v7msik/vhcOvDQQ=="
+    },
+    "vconsole-webpack-plugin": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/vconsole-webpack-plugin/-/vconsole-webpack-plugin-1.4.0.tgz",
+      "integrity": "sha512-euHyNiLCS0GW6FPNYusDuxwm0cZiigD4XKe0fPSQCXX6I3ZRz29f5llq8pF9xkWnSiobnsOngnzIWf4PpPtDGw==",
+      "requires": {
+        "vconsole": "3.2.0"
+      }
+    },
     "vendors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",

src/main/House/package.json

@@ -20,7 +20,9 @@
         "vue": "^2.5.2",
         "vue-router": "^3.0.1",
         "vue-ydui": "^1.2.2",
-        "vuex": "^3.0.1"
+        "vuex": "^3.0.1",
+        "vconsole": "^3.1.0",
+        "vconsole-webpack-plugin": "^1.2.0"
     },
     "devDependencies": {
         "autoprefixer": "^7.1.2",

src/main/House/src/App.vue

@@ -1,7 +1,10 @@
 <template>
     <div id="app">
         <transition :name="'vux-pop-' + (direction === 'forward' ? 'in' : 'out')">
-            <router-view class="router-view"></router-view>
+            <keep-alive :include="['search','getMore']">
+                <router-view class="router-view"></router-view>
+            </keep-alive>
+
         </transition>
         <progress-dialog v-if="isLoading"></progress-dialog>
     </div>

src/main/House/src/pages/Appoint.vue

@@ -11,7 +11,7 @@
             </div>
             <div class="item">
                 <div class="title">联系人</div>
-                <input type="text" placeholder="请填写联系人" v-model="userInfo.nickname">
+                <input type="text" placeholder="请填写联系人" maxlength="20" v-model="userInfo.nickname">
             </div>
             <div class="item">
                 <div class="title">电话</div>
@@ -48,7 +48,7 @@ export default {
             url: '/houseInfo/detail',
             data: {
                 id: this.$route.query.id,
-                statusFlag:1
+                statusFlag: 1
             }
         }).then(res => {
             if (res.success) {
@@ -71,7 +71,23 @@ export default {
                 this.$modal.info({ msg: "信息填写不全不能提交", duration: 1500 })
                 return
             }
+            if (!this.checkPhone(this.userInfo.phone)) {
+                this.$modal.info({ msg: "手机号格式错误", duration: 1500 })
+                return
+            }
             this.$store.commit('updateLoading', true)
+            console.log(this.date)
+            console.log(moment(this.date,'YYYY-MM-DD HH:mm'))
+            var data = {
+                userId: this.userInfo.id,
+                houseId: this.$route.query.id,
+                housekeeper: this.info.housekeeper,
+                contact: this.userInfo.nickname,
+                telephone: this.userInfo.phone,
+                leaveMessage: this.note,
+                orderTime: Date.parse(new Date(moment(this.date,'YYYY-MM-DD HH:mm')))
+            }
+            console.log(data)
             this.$http.post({
                 url: '/seeOrder/save',
                 data: {
@@ -81,7 +97,7 @@ export default {
                     contact: this.userInfo.nickname,
                     telephone: this.userInfo.phone,
                     leaveMessage: this.note,
-                    orderTime: Date.parse(new Date(this.date))
+                    orderTime: Date.parse(new Date(moment(this.date,'YYYY-MM-DD HH:mm')))
                 }
             }).then(res => {
                 this.$store.commit('updateLoading', false)

src/main/House/src/pages/ChangeNick.vue

@@ -2,7 +2,7 @@
     <div class="container">
         <div class="list" v-if="type=='nickname'">
             <div class="input">
-                <input type="text" autofocus @blur="inputFocus=false" @focus="inputFocus=true" placeholder="请输入……" v-model="userInfo.nickname">
+                <input type="text" autofocus @blur="inputFocus=false" maxlength="20" @focus="inputFocus=true" placeholder="请输入……" v-model="userInfo.nickname">
                 <img class="clear" @click="userInfo.nickname=''" v-if="inputFocus&&userInfo.nickname" src="../assets/list_icon_del.png" alt="">
             </div>
             <div class="ps">20个字符以内,仅可以使用汉字/字母/数字/下划线</div>

src/main/House/src/pages/Feedback.vue

@@ -4,10 +4,10 @@
             <textarea name="message" maxlength="300" placeholder="请描述一下您遇到的问题" v-model="message"></textarea>
             <div class="num">{{message.length}}/300</div>
             <div class="imgList">
-                <div class="img" v-for="(item,index) in imgList" :style="{backgroundImage:'url('+item+')'}">
+                <div class="img" v-for="(item,index) in imgList"  :style="{backgroundImage:'url('+item+')'}">
                     <input @change="change($event,index)" ref="file" type="file" accept="image/*">
                 </div>
-                <div class="img">
+                <div class="img" v-if="imgList.length==0">
                     <img src="@/assets/icon_zhaopian.png" alt="">
                     <input @change="change($event,imgList.length)" ref="file" type="file" accept="image/*">
                 </div>
@@ -135,6 +135,7 @@ export default {
     padding: 0.3rem 0.3rem 0;
     display: flex;
     flex-direction: column;
+    min-height: 6.38rem;
     textarea {
         min-height: 2.7rem;
         outline: none;

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

@@ -153,6 +153,7 @@ export default {
                 this.bannerList = res.data
                 setTimeout(() => {
                     var mySwiper = new Swiper('.swiper-container', {
+                        autoplay : 5000,
                     }, 1000)
                 })
             }

src/main/House/src/pages/Search.vue

@@ -69,12 +69,13 @@ export default {
             searchData: {}
         }
     },
+    name: 'search',
     created() {
         this.getAllHot()
         this.getHistory()
     },
     computed: {
-        ...mapState(["locationInfo", "userInfo"])
+        ...mapState(["locationInfo", "userInfo", 'direction'])
     },
     methods: {
         getAllHot() {
@@ -107,9 +108,9 @@ export default {
             // else {
 
             // }
-            setTimeout(()=>{
-                 this.getSearchList()
-            },600)
+            setTimeout(() => {
+                this.getSearchList()
+            }, 600)
 
         },
         getSearchList() {
@@ -131,7 +132,7 @@ export default {
             }
             data.currentPage = this.page
             data.pageNumber = 20
-            data.statusFlag=1
+            data.statusFlag = 1
             this.$http.get({
                 url: '/houseInfo/page',
                 data: data
@@ -170,7 +171,7 @@ export default {
                     currentPage: this.page,
                     recommendFlag: 'Y',
                     pageNumber: 20,
-                      statusFlag:1
+                    statusFlag: 1
                 }
             }).then(res => {
                 this.$store.commit('updateLoading', false)
@@ -256,6 +257,25 @@ export default {
         }
 
     },
+    activated() {
+        console.log(this.direction)
+        if (this.direction == 'forward') {
+            this.searchVal = ''
+            this.isSearch = false
+            this.onInput = false
+            this.hotList = []
+            this.history = []
+            this.searchList = []
+            this.page = 0
+            this.flag = true
+            this.isNothing = false
+            this.isShowScreen = false
+            this.searchData = {}
+            this.getAllHot()
+            this.getHistory()
+
+        }
+    },
     components: { GmButton, largeGoodsItem, screen }
 }
 </script>

src/main/House/src/pages/Set.vue

@@ -19,8 +19,9 @@
             </div>
             <div class="item" @click="openPicker">
                 <div class="title">生日</div>
-                <!-- <div class="val">{{getTime(birthday)}}</div> -->
-                <yd-datetime start-year="1960" type="date" @callback.native="backTime" style=" font-size: 0.32rem;color: rgba(18, 28, 38, 1);line-height: 0.44rem;text-align:right" v-model="birthday" slot="right"></yd-datetime>
+                <div class="val" :class="[birthday==nowTime?'notSet':'']">{{birthday==nowTime?'选择生日':birthday}}</div>
+
+                <yd-datetime start-year="1960" :end-year='nowYear' ref='picker' type="date" @callback.native="backTime" style=" display:none" v-model="birthday" slot="right"></yd-datetime>
                 <img class="more" src="@/assets/icon_inter.png" alt="">
             </div>
 
@@ -35,7 +36,7 @@
             <div class="item">
                 <div class="title" style="flex-grow:0">微信</div>
                 <div class="sub">ID:{{userInfo.wechatName}}</div>
-                <yd-switch :disabled='switch1' v-model="switch1" style="opacity:1;min-width:1rem" color='#15A8AA'></yd-switch>
+                <yd-switch :disabled='switch1' v-model="switch1" style="min-width:1rem" color='#15A8AA'></yd-switch>
             </div>
         </div>
 
@@ -53,6 +54,7 @@ export default {
         return {
             birthday: '',
             nowTime: '',
+            nowYear: '',
             showSex: false,
             myItems1: [
                 {
@@ -76,15 +78,17 @@ export default {
     watch: {
         birthday() {
             // this.userInfo.birthday
+            console.log(this.birthday)
             if (this.birthday != this.getTime(this.userInfo.birthday)) {
-                this.updateUser('birthday', Date.parse(new Date(this.birthday)))
+                this.updateUser('birthday', Date.parse(new Date(moment(this.birthday,'YYYY-MM-DD'))))
             }
 
         }
     },
     created() {
         this.birthday = this.getTime(this.userInfo.birthday)
-        this.nowTime = moment().format('YYYY')
+        this.nowTime = moment().format('YYYY-MM-DD')
+        this.nowYear = moment().format('YYYY')
         // setTimeout(()=>{
 
         // },50)
@@ -171,6 +175,11 @@ export default {
             font-size: 0.32rem;
             color: rgba(18, 28, 38, 1);
             line-height: 0.44rem;
+            &.notSet {
+                font-size: 0.26rem;
+                color: rgba(170, 172, 173, 1);
+                line-height: 0.36rem;
+            }
         }
 
         .more {

src/main/House/src/pages/Strategy.vue

@@ -78,6 +78,7 @@ export default {
                 slidesPerView: 'auto',
                 pagination: '.swiper-pagination',
                 paginationClickable: true,
+                autoplay : 5000,
                 paginationBulletRender: function (swiper, index, className) {
                     return '<div class="' + className + '"></div>';
                 }

src/main/House/src/pages/User.vue

@@ -114,6 +114,7 @@ export default {
     .menuList {
         margin: 0.6rem 0.3rem 0;
         height: 2.2rem;
+        min-height: 2.2rem;
         background: rgba(255, 255, 255, 1);
         box-shadow: 0rem 0.12rem 0.24rem 0rem rgba(0, 0, 0, 0.08);
         border-radius: 0.24rem;

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

@@ -46,8 +46,9 @@ export default {
             }, 100)
         }
     },
+    name: 'getMore',
     computed: {
-        ...mapState(["locationInfo", "userInfo"])
+        ...mapState(["locationInfo", "userInfo", "direction"])
     },
     methods: {
         search(val) {
@@ -85,7 +86,7 @@ export default {
             var data = this.searchData
             data.currentPage = this.page
             data.pageNumber = 20
-            data.statusFlag=1
+            data.statusFlag = 1
             this.$http.get({
                 url: '/houseInfo/page',
                 data: data
@@ -124,7 +125,7 @@ export default {
                     currentPage: this.page,
                     recommendFlag: 'Y',
                     pageNumber: 20,
-                      statusFlag:1
+                    statusFlag: 1
                 }
             }).then(res => {
                 this.$store.commit('updateLoading', false)
@@ -174,6 +175,43 @@ export default {
         }
 
     },
+    activated() {
+        console.log(this.direction)
+        if (this.direction == 'forward') {
+            this.searchList = []
+            this.page = 0
+            this.flag = true
+            this.isNothing = false
+            this.searchData = {}
+            this.$refs.screenContent.showSreen = false
+            this.$refs.screenContent.changeType = '区域'
+            this.$refs.screenContent.regionValue = ''
+            this.$refs.screenContent.regionCode = ''
+            this.$refs.screenContent.rentType = ''
+            this.$refs.screenContent.huoseType = ''
+            this.$refs.screenContent.rent = ''
+            this.$refs.screenContent.searchData = {}
+            this.$refs.screenContent.faced = ''
+            this.$refs.screenContent.area = ''
+            this.$refs.screenContent.houseFeature = ''
+            if (this.$route.query.rentingType) {
+                var rentingType = this.$route.query.rentingType
+                var rentType = ''
+                switch (rentingType) {
+                    case '0': rentType = '整租'; break;
+                    case '1': rentType = '合租'; break;
+                    case '2': rentType = '品牌公寓'; break;
+                }
+                console.log(rentType)
+                setTimeout(() => {
+                    this.$refs.screenContent.rentType = rentType
+                    setTimeout(() => {
+                        this.$refs.screenContent.getData()
+                    }, 100)
+                }, 100)
+            }
+        }
+    },
     components: { GmButton, largeGoodsItem, screen }
 }
 </script>

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.52bfd1fa8e8587e9f4afc9f86a824680.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.f7662e03d4ae7489de2c4a710a6c7050.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.b37343948282e09aa321.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.5c62c0610e6477bc8275.js></script><script type=text/javascript src=./staticWeb/house/js/app.339bc1c0211790477e2b.js></script></body></html>
+    .mint-datetime-cancel {}</style><body><div id=app></div><script type=text/javascript src=./staticWeb/house/js/manifest.5ad6bc823ea00558377e.js></script><script type=text/javascript src=./staticWeb/house/js/vendor.5c62c0610e6477bc8275.js></script><script type=text/javascript src=./staticWeb/house/js/app.2d6a37cf96361ee98bb4.js></script></body></html>

src/main/webapp/staticWeb/house/js/manifest.5ad6bc823ea00558377e.js

@@ -0,0 +1,2 @@
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,u,b=0,i=[];b<r.length;b++)d=r[b],t[d]&&i.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);i.length;)i.shift()();if(o)for(b=0;b<o.length;b++)u=c(c.s=o[b]);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 a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"house/js/"+e+"."+{0:"9f58be4ad468b87c03b1",1:"f343135143e4f31fcbba",2:"633cb55458313e64b21f",3:"dece21d003dee5bbc24c",4:"e0d63ebcde94bfcd4a7a",5:"aa86283d633bccb3af4d",6:"8c4bb944ccdf0dcfa8d2",7:"41688c22304583e32562",8:"1f2f8f476e88adb58e15",9:"7e6bfa07f754537de6b5",10:"c1baaf207418d4717864",11:"959c2c9ce5023d00d410",12:"c22a78756c8f731af5ec",13:"54870e93c85e7b1a55f1",14:"b2daa59e72aa0344a9e4",15:"a2d6713a0ca235622d20",16:"7a9b8cafeb7c0fc31527",17:"5bbdbb41df8aa8df299b"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),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.5ad6bc823ea00558377e.js.map

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

@@ -1,2 +0,0 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,u,d,i=0,b=[];i<r.length;i++)u=r[i],t[u]&&b.push(t[u][0]),t[u]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(i=0;i<a.length;i++)d=o(o.s=a[i]);return d};var r={},t={20:0};function o(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,o),t.l=!0,t.exports}o.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,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"house/js/"+e+"."+{0:"9f58be4ad468b87c03b1",1:"f343135143e4f31fcbba",2:"7ccf75adf9825037f75b",3:"f58ace20946631a95353",4:"85906adcdbf8b33f17b8",5:"fa76a603c7b45d60b022",6:"d27f10f7ae1665d172f5",7:"41688c22304583e32562",8:"1f2f8f476e88adb58e15",9:"7e6bfa07f754537de6b5",10:"7b9d8cc23768cfbc3b5a",11:"959c2c9ce5023d00d410",12:"5a63e19ded6cced67095",13:"393228a06c1906fa7798",14:"2129c899e299f07721e6",15:"8bae9a0b39ce9474f682",16:"23685adbdf2e343e2736",17:"4742096b2428bdbd2bad"}[e]+".js";var f=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./staticWeb/",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.b37343948282e09aa321.js.map