后台

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -36,7 +36,7 @@
         select
         <include refid="Base_Column_List"/>
         from user_info
-        where id = #{id,jdbcType=INTEGER}
+        where id = #{id,jdbcType=INTEGER} and del_flag = 'N'
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from user_info

src/main/vue/src/pages/BannerInfo.vue

@@ -53,6 +53,10 @@ export default {
             saving: false,
             formData: {},
             rules: {
+                title:
+                    [
+                        { required: true, message: '请输入标题', trigger: 'blur' },
+                    ],
             },
         }
     },

src/main/vue/src/pages/ContactRecord.vue

@@ -47,6 +47,15 @@ export default {
                 showFlag: 'Y'
             },
             rules: {
+                userId: [
+                    { required: true, message: '请输入用户ID', trigger: 'blur' },
+                ],
+                houseId: [
+                    { required: true, message: '请输入房源ID', trigger: 'blur' },
+                ],
+                housekeeper: [
+                    { required: true, message: '请输入管家ID', trigger: 'blur' },
+                ],
             },
         }
     },

src/main/vue/src/pages/Feedbacks.vue

@@ -6,8 +6,8 @@
 
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="$router.push('/feedback')" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
-            </el-button>
+            <!-- <el-button @click="$router.push('/feedback')" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
+            </el-button> -->
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
                     筛选数据

src/main/vue/src/pages/HotSearch.vue

@@ -39,6 +39,10 @@ export default {
             saving: false,
             formData: {},
             rules: {
+                keyWord:
+                    [
+                        { required: true, message: '请输入关键词', trigger: 'blur' },
+                    ],
             },
         }
     },

src/main/vue/src/pages/HouseImage.vue

@@ -56,6 +56,14 @@ export default {
                 imageType: '0'
             },
             rules: {
+                houseId:
+                    [
+                        { required: true, message: '请输入房源ID', trigger: 'blur' },
+                    ],
+                imageUrl:
+                    [
+                        { required: true, message: '请上传图片', trigger: 'blur' },
+                    ],
             },
         }
     },

src/main/vue/src/pages/HouseInfo.vue

@@ -318,6 +318,18 @@ export default {
                 lineCode: '110460689',
             },
             rules: {
+                title:
+                    [
+                        { required: true, message: '请输入标题', trigger: 'blur' },
+                    ],
+                price:
+                    [
+                        { required: true, message: '请输入价格', trigger: 'blur' },
+                    ],
+                payMode:
+                    [
+                        { required: true, message: '请输入付款方式', trigger: 'blur' },
+                    ],
             },
             houseFeatures: [],
             houseParts: [],

src/main/vue/src/pages/HouseKeeper.vue

@@ -51,6 +51,18 @@ export default {
             saving: false,
             formData: {},
             rules: {
+                keepName:
+                    [
+                        { required: true, message: '请输入名称', trigger: 'blur' },
+                    ],
+                position:
+                    [
+                        { required: true, message: '请输入职位', trigger: 'blur' },
+                    ],
+                telephone:
+                    [
+                        { required: true, message: '请输入电话', trigger: 'blur' },
+                    ],
             },
         }
     },

src/main/vue/src/pages/HousingDistrict.vue

@@ -104,7 +104,16 @@ export default {
                 lng: 118.79647,
                 address: '',
             },
-            rules: {},
+            rules: {
+                fullName:
+                    [
+                        { required: true, message: '请输入名称', trigger: 'blur' },
+                    ],
+                code:
+                    [
+                        { required: true, message: '请输入CODE', trigger: 'blur' },
+                    ],
+            },
             districts: [],
             streets: [],
             mapDialogVisible: false,

src/main/vue/src/pages/NewsInfo.vue

@@ -72,6 +72,10 @@ export default {
                 recommend: 'N'
             },
             rules: {
+                title:
+                    [
+                        { required: true, message: '请输入标题', trigger: 'blur' },
+                    ],
             },
         }
     },

src/main/vue/src/pages/SeeOrder.vue

@@ -78,7 +78,7 @@ export default {
         return {
             saving: false,
             formData: {
-                orderStatus: '',
+                orderStatus: '0',
                 showFlag: 'Y'
             },
             rules: {

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>admin</title><script defer=defer src=https://use.fontawesome.com/releases/v5.0.10/js/all.js integrity=sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+ crossorigin=anonymous></script><link href=/static/css/app.4b7d6c8f482bef1fc4ac09bd6de3053c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.d24d8c254838efbaaf5f.js></script><script type=text/javascript src=/static/js/vendor.5c8b31b525cf4ff798a3.js></script><script type=text/javascript src=/static/js/app.66d5e06306b89c23999a.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>admin</title><script defer=defer src=https://use.fontawesome.com/releases/v5.0.10/js/all.js integrity=sha384-slN8GvtUJGnv6ca26v8EzVaR9DC58QEwsIk9q1QXdCU8Yu8ck/tL/5szYlBbqmS+ crossorigin=anonymous></script><link href=/static/css/app.4b7d6c8f482bef1fc4ac09bd6de3053c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6d93ebb55691a7ee9be8.js></script><script type=text/javascript src=/static/js/vendor.5c8b31b525cf4ff798a3.js></script><script type=text/javascript src=/static/js/app.e8f18f0ce75381abd0a7.js></script></body></html>

src/main/webapp/static/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/static/house/js/9.7e6bfa07f754537de6b5.js

@@ -1,2 +0,0 @@
-webpackJsonp([9],{"/Vz3":function(t,e,s){t.exports=s.p+"house/img/info_icon_shouchang_kong.63b8eba.png"},TGYN:function(t,e,s){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a=s("Dd8w"),n=s.n(a),i=s("qkow"),o=s("Cpzv"),r=s("NYxO"),c={data:function(){return{list:[],flag:!0,currentPage:0}},created:function(){this.$store.commit("updateLoading",!0),this.getData()},computed:n()({},Object(r.b)(["locationInfo","userInfo"])),methods:{getData:function(){var t=this;this.flag&&(this.flag=!1,0==this.currentPage&&(this.list=[]),this.currentPage++,this.$http.get({url:"/userCollection/page",data:{userId:this.userInfo.id,currentPage:this.currentPage,pageNumber:20,showFlag:"Y"}}).then(function(e){t.$store.commit("updateLoading",!1),e.success&&(e.data.pp.forEach(function(e){t.list.push(e)}),e.data.page.currentPage<e.data.page.totalPage&&(t.flag=!0))}))},menu:function(){this.$refs.list.scrollTop+this.$refs.list.offsetHeight>=this.$refs.list.scrollHeight&&this.getData()},goHome:function(){this.$router.push({name:"home"})}},components:{GmButton:i.a,largeGoodsItem:o.a}},l={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"container"},[t.list.length>0?a("div",{ref:"list",staticClass:"list",on:{scroll:t.menu}},t._l(t.list,function(e,s){return a("largeGoodsItem",{attrs:{goodsInfo:e.houseInfo,hasLine:s!=t.list.length-1}})})):a("div",{staticClass:"nothing"},[a("img",{attrs:{src:s("/Vz3"),alt:""}}),t._v(" "),a("div",{staticClass:"title"},[t._v("还没收藏任何房源哦～")]),t._v(" "),a("div",{staticClass:"btn"},[a("gm-button",{attrs:{type:"primary"},on:{click:t.goHome}},[t._v("去逛逛")])],1)])])},staticRenderFns:[]};var u=s("VU/8")(c,l,!1,function(t){s("dypU")},"data-v-b425f28c",null);e.default=u.exports},dypU:function(t,e){}});
-//# sourceMappingURL=9.7e6bfa07f754537de6b5.js.map

src/main/webapp/static/house/js/manifest.2a1a0d876829815964e2.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="./static/",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.2a1a0d876829815964e2.js.map

src/main/webapp/static/js/14.fa71318dac0e6b535ec5.js → src/main/webapp/static/js/13.b1457b182f2a7d787bb5.js

@@ -1,2 +1,2 @@
-webpackJsonp([14],{Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("bGW8")},"data-v-f8763b4a",null);t.default=s.exports},bGW8:function(e,t){}});
-//# sourceMappingURL=14.fa71318dac0e6b535ec5.js.map
+webpackJsonp([13],{Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("bGW8")},"data-v-f8763b4a",null);t.default=s.exports},bGW8:function(e,t){}});
+//# sourceMappingURL=13.b1457b182f2a7d787bb5.js.map