From 8d287597d2a587408252f0c0b8a0ee89e0fa471c Mon Sep 17 00:00:00 2001 From: wesley88 <9519127+wesley88@user.noreply.gitee.com> Date: Fri, 7 Mar 2025 16:01:52 +0800 Subject: [PATCH] 1 --- admin-web-master/dist.zip | Bin 5860744 -> 0 bytes admin-web-master/src/api/newly.js | 7 ++++--- admin-web-master/src/utils/request.js | 4 ++-- admin-web-master/src/views/promotion/contentMant.vue | 4 ++-- admin-web-master/src/views/shopRental/manage/index.vue | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------- lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- lvdao-miniapp/pages/workbench/workbench.vue | 4 ++-- lvdao-miniapp/utils/request.js | 10 +++++----- 8 files changed, 210 insertions(+), 105 deletions(-) diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip index 111932a..51fbd42 100644 Binary files a/admin-web-master/dist.zip and b/admin-web-master/dist.zip differ diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index 1036f9b..2ad56a4 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -6,9 +6,10 @@ export function general(data) { url: '/oaInterconnection/general', method: 'post', data, - // headers: { - // 'Content-Type': 'Multipart/form-data' - // } + headers: { + // 'Content-Type': 'application/octet-stream' + 'Content-Type': 'multipart/form-data' + } }) } // 生成合同附件 diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 95d225c..647db53 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,10 +17,10 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - baseURL = 'http://128.10.250.209:9003'; + // baseURL = 'http://128.10.250.209:9003'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://128.10.250.209:9003'; + baseURL = 'http://128.10.249.47:9003'; } else { console.error('---------------------') diff --git a/admin-web-master/src/views/promotion/contentMant.vue b/admin-web-master/src/views/promotion/contentMant.vue index 3f8a772..7f03875 100644 --- a/admin-web-master/src/views/promotion/contentMant.vue +++ b/admin-web-master/src/views/promotion/contentMant.vue @@ -85,7 +85,7 @@ @@ -229,7 +229,7 @@ - + +
OA
合同变更
合同续约
合同终止
@@ -204,41 +205,68 @@ this.getAll() }, methods: { - async OA(row){ - const response = await axios.get(this.$baseURL+row.appendicesContract); + downloadBase64File(base64String, fileName, mimeType) { + try { + // 将 Base64 字符串解码为二进制数据 + const byteCharacters = atob(base64String); + const byteNumbers = new Array(byteCharacters.length); + for (let i = 0; i < byteCharacters.length; i++) { + byteNumbers[i] = byteCharacters.charCodeAt(i); + } + const byteArray = new Uint8Array(byteNumbers); + + // 创建 Blob 对象 + const blob = new Blob([byteArray], { type: mimeType }); + + // 生成下载链接并触发下载 + const url = window.URL.createObjectURL(blob); + const link = document.createElement('a'); + link.href = url; + link.setAttribute('download', fileName); // 设置下载文件名 + document.body.appendChild(link); + link.click(); - // 处理二进制数据 - const blob = response.data; - console.log(blob); + // 清理生成的 URL 对象 + window.URL.revokeObjectURL(url); + document.body.removeChild(link); + + console.log('文件下载成功:', fileName); + } catch (error) { + console.error('文件下载失败:', error); + } + }, + async OA(row){ + console.log(this.$baseURL+row.appendicesContract) + const response = await axios({ + method: 'get', + url: this.$baseURL + row.appendicesContract, // 文件 URL + responseType: 'arraybuffer' // 指定响应类型为二进制数据 + }); + console.log(JSON.stringify(response.data)); // return - const base64Data = Buffer.from(blob, 'binary').toString('base64'); + const buffer = Buffer.from(response.data); + const base64Data = buffer.toString('base64'); console.log(base64Data); + // this.downloadBase64File(base64Data, 'contract_file', response.headers['content-type']); // return - const file = new File([blob], 'filename.txt', { type: 'text/plain' }); + const file = new File([response.data], 'filename.txt', { type: 'text/plain' }); console.log(file); let fd = new FormData(); - fd.append('fileBytes', file); // 假设 formData 包含文件 - fd.append('fileName', '"合同.txt"'); + fd.append('files', file); // 假设 formData 包含文件 + fd.append('reviewers', '1858710592190291968'); + fd.append('fileNames', '合同.docx'); + fd.append('title', '这是一个流程'); console.log(fd); - let c1 ={ - "account": "zsfu-test", - "password": "000009", - "accessKey": "HfHJ1cDCX4PuwSC5hoxQcvJCdvnNFG0C", - "secretAccessKey": "tO5ebUtKpO60o4E90bfUBvl145R49Zg4", - "id": "5c19f869063e57766b127177143e5c5d", - "sponsor": "1834057529668276224", - "reviewers": ["1858710592190291968"], - "files": [ - { - fileName:'合同.txt', - fileBytes:base64Data - } - ], - "title": "这是一个流程" - } + // return + // let c1 ={ + // "reviewers": '1858710592190291968', + // "fileNames":'合同.docx', + // "files":file, + // "title": "这是一个流程" + // } // c1.files.push(fd) - console.log(c1); - general(c1).then(res => { + // console.log(fd); + general(fd).then(res => { console.log(res); let data = JSON.parse(res.data) if(data.code == '0'){ @@ -260,44 +288,8 @@ }) } }) - return - // URL.createObjectURL(this.$baseURL+row.appendicesContract) - const xhr = new XMLHttpRequest(); - xhr.open('GET', this.$baseURL+row.appendicesContract, true); - xhr.responseType = 'blob'; // 设置响应类型为 blob - - xhr.onload = () => { - if (xhr.status === 200) { - const blob = xhr.response; - console.log(blob); - // general({ - // "title":"这是一个流程", - // "files": [{ - // "fileBytes":blob, - // "fileName":"合同.txt" - // }] - // }).then(res => { - - // }) - // 如果需要保存文件，可以创建一个 URL 对象并下载 - const url = window.URL.createObjectURL(blob); - const link = document.createElement('a'); - link.href = url; - console.log(link); - link.setAttribute('download', 'filename.ext'); // 设置下载的文件名 - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - } else { - console.error('下载文件时出错:', xhr.status); - } - }; - - xhr.onerror = () => { - console.error('下载文件时出错'); - }; - xhr.send(); + }, gettime() { // 获取当前时间 diff --git a/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue b/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue index ae3a312..352748d 100644 --- a/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue +++ b/lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue @@ -2,30 +2,34 @@
- 2024年 + {{year}}年 - +
-
6451.00
+
0
 + 暂无数据 - + - 7月 - 6451.00 + {{item.yue}}月 + {{item.children | itemnum}} - + 暂无缴费数据 + - {{item.orderNumber}} - 500.00 + {{v.transactionNumber}} + {{Number(v.actualPaymentFee)/100}} - 物业费、服务费、卫生费 - 共3项 + + {{t.itemName}} + + 共{{v.paymentContent.length}}项 - 支付成功 - 07.11 15:21 + {{v.orderStatus=='0'?'待支付':v.orderStatus=='1'?'支付成功':v.orderStatus=='2'?'支付失败':'-'}} + {{v.paymentStartTime}} @@ -37,13 +41,68 @@ export default { data() { return { + year:'2025', show: false, dataList: [ - { - children: [{}, {}] + { yue:'1', + children: [ + + ] }, - { - children: [{}, {}] + { yue:'2', + children: [ + + ] + }, + { yue:'3', + children: [ + + ] + }, + { yue:'4', + children: [ + + ] + }, + { yue:'5', + children: [ + + ] + }, + { yue:'6', + children: [ + + ] + }, + { yue:'7', + children: [ + + ] + }, + { yue:'8', + children: [ + + ] + }, + { yue:'9', + children: [ + + ] + }, + { yue:'10', + children: [ + + ] + }, + { yue:'11', + children: [ + + ] + }, + { yue:'12', + children: [ + + ] }, ] } @@ -51,17 +110,70 @@ onLoad() { this.gain() }, + filters:{ + itemnum(e){ + // console.error(e) + let num = 0 + for (let n = 0; n < e.length; n++) { + num = num + (Number(e[n].actualPaymentFee)/100) + // if(e[n].isshowxz){ + // num = num + Number(e[n].payPrice) + // } + } + return num + } + }, + computed:{ + // allnum() { + // let num = 0 + // for (let i = 0; i < this.recordList.length; i++) { + // let list = this.recordList[i].itemDetailsVOList + // for (let n = 0; n < list.length; n++) { + // num = num + Number(list[n].payPrice) + // } + // } + // return num + // }, + // allitemnum() { + // let num = 0 + // for (let i = 0; i < this.recordList.length; i++) { + // let list = this.recordList[i].itemDetailsVOList + // for (let n = 0; n < list.length; n++) { + // if(list[n].isshowxz){ + // num = num + Number(list[n].payPrice) + // } + // } + // } + // return num + // }, + }, methods: { - gain() { - this.$http.sendRequest('cerePaymentInfo/queryByPage', 'POST',{paymentAccount:uni.getStorageSync('user').phone, "pageSize":10, -    "pageNumber":0, -    "year":"2025", -    "month":"3"} ,1).then(res => { - this.dataList = res.data.data.content.map(item=>{ - return item + change(e) { + console.error(e) + this.year = e.year + this.gain() + }, + async gain() { + for (let i = 0; i < this.dataList.length; i++) { + let c1 ={ + paymentAccount:uni.getStorageSync('user').phone, "pageSize":10, +     "pageNumber":0, +     "year":this.year, +     "month":this.dataList[i].yue, + } + await this.$http.sendRequest('cerePaymentInfo/queryByPage','POST',c1,1).then(res => { + this.dataList[i].children = res.data.data.content.map(item=>{ + item.paymentContent = JSON.parse(item.paymentContent) + return item + }) + // this.dataList = res.data.data.content.map(item=>{ + // return item + // }) + // console.error(this.dataList) }) - console.error(this.dataList) - }) + } + console.error(this.dataList) + }, toDetail() { uni.navigateTo({ diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index d81ef1c..dc75231 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -133,8 +133,8 @@ children: [ { name: '问卷调查', img: '/wjdc.png', path: '/pages/questionnaire/questionnaire' }, // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, - { name: '我的活动', img: '/wdhd.png', path: '/pages/participation/participation' }, - { name: '活动申请', img: '/hdsq.png', path: '/pages/mycreated/mycreated' }, + { name: '活动参与', img: '/wdhd.png', path: '/pages/participation/participation' }, + { name: '活动申请', img: '/hdsq.png', path: '/pages/activityAdd/activityAdd' }, { name: '意向申请', img: '/yxsq.png', path: '/pages/rsaManagement/rsaManagement' }, ] }, diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 67171de..34dfeb5 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -1,8 +1,8 @@ // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -let c1 = 'https://jy.scjysm.asia:18086/' -// let c1 = 'https://zhgw-uat.028wlkj.com/' +// let c1 = 'https://jy.scjysm.asia:18086/' +let c1 = 'https://zhgw-uat.028wlkj.com/' //封装request请求 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { //判断header提交数据类型 @@ -16,7 +16,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { } var bases = '' if(baseUrl == 1){ - bases = 'http://128.10.250.25:9003/' + url; + // bases = 'http://128.10.249.32:9003/' + url; // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; @@ -24,7 +24,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'http://128.10.249.21:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; - // bases = c1 + 'cdwlMall/meserver/admin-server' + url; + bases = c1 + 'cdwlMall/meserver/admin-server' + url; }else if(baseUrl == 3){ // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; @@ -63,7 +63,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { success(res) { uni.hideLoading(); var code = res.data.code+''; - console.log("res",res) + // console.log("res",res) switch (code) { case '20001': uni.showModal({ -- libgit2 0.21.4