From 8cb5c17e961feed2e34f4b3e0a2be17f13a68674 Mon Sep 17 00:00:00 2001 From: 2509699674 <2509699647@qq.com> Date: Mon, 16 Dec 2024 10:25:39 +0800 Subject: [PATCH] '最新1' --- yanshouban/src/App.vue | 30 +++++++++++++++++------------- yanshouban/src/api/rentalMan.js | 28 ++++++++++++++++++++++++++++ yanshouban/src/utils/request.js | 4 ++-- yanshouban/src/views/active/couponlist/component/shopList.vue | 10 ++++++++++ yanshouban/src/views/ads/fangli/index.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- yanshouban/src/views/business/autd/index.vue | 6 ++++++ yanshouban/src/views/business/businessList/index.vue | 9 +++++++++ yanshouban/src/views/channel/list/index.vue | 6 ++++++ yanshouban/src/views/comment/commentSys/index.vue | 6 ++++++ yanshouban/src/views/comprehensive/Lcinquiry/index.vue | 13 ++++++++++++- yanshouban/src/views/comprehensive/OrderRhq/index.vue | 6 ++++++ yanshouban/src/views/comprehensive/dAddress/index.vue | 12 ++++++++++++ yanshouban/src/views/comprehensive/psRanking/index.vue | 4 ++-- yanshouban/src/views/couponmanagement/coupon.vue | 40 ++++++++++++++++++++++++---------------- yanshouban/src/views/member/memberList/index.vue | 5 +++++ yanshouban/src/views/online/QRCode/index.vue | 9 +++++++++ yanshouban/src/views/online/QRFunds/index.vue | 8 ++++++++ yanshouban/src/views/online/reconciliationProcessing/index.vue | 6 ++++++ yanshouban/src/views/order/orderany/index.vue | 6 ++++++ yanshouban/src/views/order/ordersel/index.vue | 7 +++++++ yanshouban/src/views/order/pending/index.vue | 6 ++++++ yanshouban/src/views/renovation/brand/index.vue | 6 ++++++ yanshouban/src/views/rent/audit/index.vue | 17 ++++++++++++++++- yanshouban/src/views/salesSta/dataSta.vue | 8 +++++++- yanshouban/src/views/setup/user/index.vue | 6 ++++++ yanshouban/src/views/shopRental/manage/index.vue | 2 +- yanshouban/src/views/shopRental/renewalMan/index.vue | 723 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- yanshouban/src/views/shopRental/rentTermination/index.vue | 712 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- yanshouban/src/views/shopRental/rentalMan/index.vue | 1535 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- yanshouban/src/views/shopRental/warning/index.vue | 28 +++++++++++++++++++--------- 30 files changed, 1780 insertions(+), 1532 deletions(-) diff --git a/yanshouban/src/App.vue b/yanshouban/src/App.vue index 48b89e2..ced9d41 100644 --- a/yanshouban/src/App.vue +++ b/yanshouban/src/App.vue @@ -28,22 +28,26 @@ export default { created() { // this.fetchData() + let refreshToken= localStorage.getItem('refreshToken'); - // if (this.$store.state.user.token) { - // this.getPrivacySwitch(); - // } else if (refreshToken) { - // this.handleLogin(); - // } else { - // window.location.href = 'https://zhld.scjysm.com:1443/home'; // 直接跳转到指定的 URL - // } - if (refreshToken) { - console.log(refreshToken) - this.handleLogin(); - } else if (this.$store.state.user.token) { + + if (this.$store.state.user.token) { this.getPrivacySwitch(); - } else { - window.location.href = 'https://zhld.scjysm.com:1443/home'; // 直接跳转到指定的 URL + } else{ + this.handleLogin(); } +// if (refreshToken) { +// if(!this.$store.state.user.token) { +// this.handleLogin(); +// } +// } else { + +// window.location.href = 'https://zhld.scjysm.com:1443/home'; // 直接跳转到指定的 URL +// } +// if (this.$store.state.user.token) { +// this.getPrivacySwitch(); +// } + }, methods: { handleLogin () { diff --git a/yanshouban/src/api/rentalMan.js b/yanshouban/src/api/rentalMan.js index b6f3c64..92585f6 100644 --- a/yanshouban/src/api/rentalMan.js +++ b/yanshouban/src/api/rentalMan.js @@ -23,3 +23,31 @@ export function rentalAdd(data) { data }) } + +//导出出租管理 +export function excelRentOutQueryByPage(data) { + return request({ + url: '/cereLeasingInformation/excelRentOutQueryByPage', + method: 'post', + data, + responseType: 'blob' + }) +} +//导出决算管理 +export function excelManagementOfFinalAccountsForRentals(data) { + return request({ + url: '/cereLeasingInformation/excelManagementOfFinalAccountsForRentals', + method: 'post', + data, + responseType: 'blob' + }) +} +//导出续租管理 +export function excelLeaseRenewalManagement(data) { + return request({ + url: '/cereLeasingInformation/excelLeaseRenewalManagement', + method: 'post', + data, + responseType: 'blob' + }) +} diff --git a/yanshouban/src/utils/request.js b/yanshouban/src/utils/request.js index da1dea4..ccc88a8 100644 --- a/yanshouban/src/utils/request.js +++ b/yanshouban/src/utils/request.js @@ -21,9 +21,9 @@ if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61. // PREFIX = 'http://172.16.61.48/meserver/admin-server'; // PREFIX = 'http://192.168.2.213:9003'; // PREFIX = 'http://8.130.38.56:8019/admin-server'; - // PREFIX = 'http://192.168.2.250:9003'; + PREFIX = 'http://192.168.8.106:9003'; // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'; - PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; + // PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server'; // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server' diff --git a/yanshouban/src/views/active/couponlist/component/shopList.vue b/yanshouban/src/views/active/couponlist/component/shopList.vue index 675562f..15cbb93 100644 --- a/yanshouban/src/views/active/couponlist/component/shopList.vue +++ b/yanshouban/src/views/active/couponlist/component/shopList.vue @@ -122,6 +122,16 @@ export default { const res = await businessListGetAll(formInline) this.total = res.data.total this.tableData = res.data.list + this.tableData.map(res=>{ + res.shopPhone = this.$decrypt(res.shopPhone) + res.shopPassword = this.$decrypt(res.shopPassword) + res.idCardNum = this.$decrypt(res.idCardNum) + res.emailAddress = this.$decrypt(res.emailAddress) + res.shopAdress = this.$decrypt(res.shopAdress) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.chargePersonPhone = this.$decrypt(res.chargePersonPhone) + + }) } } } diff --git a/yanshouban/src/views/ads/fangli/index.vue b/yanshouban/src/views/ads/fangli/index.vue index d719015..299ebed 100644 --- a/yanshouban/src/views/ads/fangli/index.vue +++ b/yanshouban/src/views/ads/fangli/index.vue @@ -168,10 +168,13 @@