diff --git a/.env.development b/.env.development index 576d3de..893c0ff 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ NODE_ENV = 'development' -VUE_APP_URL = 'http://121.41.26.225:8004/1' -VUE_APP_CDN = 'http://121.41.26.225:8004/1' \ No newline at end of file +VUE_APP_URL = 'http://121.41.26.225:8004' +VUE_APP_CDN = 'http://121.41.26.225:8004' \ No newline at end of file diff --git a/.env.production b/.env.production index 7338b2f..e931731 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ NODE_ENV = 'production' -VUE_APP_URL = 'http://121.41.26.225:8004/1' -VUE_APP_CDN = 'http://121.41.26.225:8004/1' \ No newline at end of file +VUE_APP_URL = 'http://121.41.26.225:8004' +VUE_APP_CDN = 'http://121.41.26.225:8004' \ No newline at end of file diff --git a/src/api/basic/index.js b/src/api/basic/index.js index 98154c8..8acfc97 100644 --- a/src/api/basic/index.js +++ b/src/api/basic/index.js @@ -1,9 +1,9 @@ import httpService from "@/request" // 获取预报列表 -export function forecastList(params) { +export function functionName(params) { return httpService({ - url: `/order/forecast/lists`, + url: `url`, method: 'post', data: params, }) diff --git a/src/api/login/index.js b/src/api/login/index.js new file mode 100644 index 0000000..d817180 --- /dev/null +++ b/src/api/login/index.js @@ -0,0 +1,10 @@ +import httpService from "@/request" + +// 登录 +export function loginTel(params) { + return httpService({ + url: `/manage/loginTelCode`, + method: 'post', + data: params, + }) +} diff --git a/src/request/index.js b/src/request/index.js index 05c47c3..f9538c8 100644 --- a/src/request/index.js +++ b/src/request/index.js @@ -1,15 +1,9 @@ -/* - * @Author: your name - * @Date: 2021-10-13 09:28:02 - * @LastEditTime: 2021-11-11 10:45:00 - * @LastEditors: Please set LastEditors - * @Description: In User Settings Edit - * @FilePath: /data-show/src/request/index.js - */ import axios from 'axios'; -import qs from 'qs'; +// import qs from 'qs'; import router from "@/permission" import { message} from 'ant-design-vue' +import store from '@/store' +// import baseURL from "@/utils/baseURL" function filterRequestData(obj) { let o = {}; for(let key in obj) { @@ -23,23 +17,20 @@ function filterRequestData(obj) { } //创建axios的实例 const httpService = axios.create({ - baseURL: 'http://cloud.sws010.com',// TODO:具体的配置可以根据项目情况而来 + baseURL: process.env.VUE_APP_URL + '/1',// TODO:具体的配置可以根据项目情况而来 timeout: 5000 }) //axios的拦截--request httpService.interceptors.request.use(config => { - // 请求成功处理 - // if(localStorage.getItem('token')){//判断浏览器中的cookie中是否存在项目的token - // config.headers.token = localStorage.getItem('token') - // } const rqParams = filterRequestData(config.params); const rqData = filterRequestData(config.data); // post 'Content-Type' === 'application/x-www-form-urlencoded' - // manage-login-token - config.headers['Content-Type'] = 'application/x-www-form-urlencoded' + config.headers['Content-Type'] = "application/json"; + config.headers['manage-login-token'] = store.getters.getToken; + config.headers['device-type'] = "web"; if(config.method === 'post') { - config.data = qs.stringify(rqData); + config.data = rqData; } else { config.data = rqData; config.params = rqParams; @@ -53,24 +44,25 @@ httpService.interceptors.request.use(config => { httpService.interceptors.response.use(response => { // TODO:具体的code对应的处理可继续添加修改 let data = null; - let data1 = null; let msg = ''; let res = response.data; - let totalNum = 0; - if(res.Code == 1){ - data = res.Data || []; - data1 = res.Data1 || []; - msg = res.Msg || ""; - totalNum = res.totalNum || 0; - return {data,data1, msg, totalNum}; + if(res.code == 0){ + data = res.data; + msg = res.msg || ""; + return {data, msg}; + } else if(res.code == 100000) { + router.replace({ + path: '/login' + }); } else { - msg = res.Msg || ""; + msg = res.msg || ""; message.error(msg); return Promise.reject(new Error(msg)) } },err => { + console.log(err) // TODO:具体的code对应的处理可继续添加修改 - if(err.response.Code === 301){ + if(err.response.code === 301){ //登录过期跳转登录页面，并将要浏览的页面fullPath传过去，登录成功后跳转需要访问的页面 ---主页(index) 或者 退出到登录前的浏览的页面 //这样登录页面登录接口成功之后可以进行跳转 主页(index) 或者 退出到登录前的页面： let path = this.$route.query.redirect || '/index.js'; this.$router.push(path); setTimeout(() => { diff --git a/src/router/basic.js b/src/router/basic.js index a10d294..0698aa5 100644 --- a/src/router/basic.js +++ b/src/router/basic.js @@ -70,7 +70,15 @@ export default [ hide: false, component: resolve => require(['@/views/Basic/EstateInfo/_houseHoldInfo'], resolve), meta: {title: '住户信息'}, - } + }, + { + path: '/EstateInfo/HouseHoldAudit', + name: "HouseHoldAudit", + title: "住户审核", + hide: false, + component: resolve => require(['@/views/Basic/EstateInfo/_houseHoldAudit'], resolve), + meta: {title: '住户审核'}, + }, ] }, // { diff --git a/src/views/Basic/Authority/index.vue b/src/views/Basic/Authority/index.vue index c5eb1db..9aa1801 100644 --- a/src/views/Basic/Authority/index.vue +++ b/src/views/Basic/Authority/index.vue @@ -25,8 +25,8 @@ > diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue index 35b9403..249e681 100644 --- a/src/views/Basic/Employee/index.vue +++ b/src/views/Basic/Employee/index.vue @@ -70,9 +70,9 @@ - 详情 - 重置密码 - + 详情 + 重置密码 + {{ scope === 1 ? "可" : "" diff --git a/src/views/Basic/EstateInfo/_buildingManage/index.vue b/src/views/Basic/EstateInfo/_buildingManage/index.vue index 1f0255b..b492673 100644 --- a/src/views/Basic/EstateInfo/_buildingManage/index.vue +++ b/src/views/Basic/EstateInfo/_buildingManage/index.vue @@ -25,8 +25,8 @@ > diff --git a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue new file mode 100644 index 0000000..5ade897 --- /dev/null +++ b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue @@ -0,0 +1,264 @@ + + + + + \ No newline at end of file diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue index 51d5fe8..4768166 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue @@ -60,7 +60,7 @@ " > - + {{ item.manageBuildingName + @@ -76,16 +76,16 @@ - - 编辑 - 删除 - + + 编辑 + 删除 + - {{ tag === 1 ? "业主" : tag === 2 ? "业主亲属" :tag === 3 ? "租户":'租户亲属' }} + {{ tag === 1 ? "业主" : tag === 2 ? "业主亲属" :tag === 3 ? "租户":tag === 4 ? "租户亲属":'-' }} @@ -96,17 +96,191 @@ :width="720" :visible="drawer.add.show" :body-style="{ paddingBottom: '80px' }" - @close="onClose" + @close="addClose" >
基本信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 身份证徽面照 + + avatar +
+ +
+
+
+ + + + 身份证头像照 + + avatar +
+ +
+
+
+ + +
+ 关联信息 + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+ 联系信息 + + + + + + + + + + + + 其他信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
关闭 - 提交 + 提交
@@ -116,6 +290,10 @@ export default { data() { return { + imageUrl: '', + form:{ + identity:2 + }, drawer:{ add:{ show: false @@ -269,6 +447,23 @@ export default { this.newData = this.tableData }, methods: { + addClose(){ + this.drawer.add.show = false; + }, + handleChange(info){ + console.log(info); + }, + beforeUpload(file) { + const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; + if (!isJpgOrPng) { + this.$message.error('You can only upload JPG file!'); + } + const isLt2M = file.size / 1024 / 1024 < 2; + if (!isLt2M) { + this.$message.error('Image must smaller than 2MB!'); + } + return isJpgOrPng && isLt2M; + }, // 表格行切换房屋 changeHouse(value){ // 遍历每行 @@ -321,13 +516,21 @@ export default { \ No newline at end of file diff --git a/src/views/Basic/EstateInfo/_houseManage/index.vue b/src/views/Basic/EstateInfo/_houseManage/index.vue index 5b7a9bb..1f112a0 100644 --- a/src/views/Basic/EstateInfo/_houseManage/index.vue +++ b/src/views/Basic/EstateInfo/_houseManage/index.vue @@ -70,8 +70,8 @@ - 编辑 - 删除 + 编辑 + 删除 diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue index 321562c..82754e2 100644 --- a/src/views/Login/index.vue +++ b/src/views/Login/index.vue @@ -24,7 +24,7 @@   三天之内免登陆 - + 登录 @@ -149,6 +149,7 @@