1

wesley88
1 parent f8d9577f
Showing 8 changed files with 210 additions and 105 deletions
admin-web-master/dist.zip
admin-web-master/src/api/newly.js
admin-web-master/src/utils/request.js
admin-web-master/src/views/promotion/contentMant.vue
admin-web-master/src/views/shopRental/manage/index.vue
lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
lvdao-miniapp/pages/workbench/workbench.vue
lvdao-miniapp/utils/request.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'
+    }
   })
 }
 // 生成合同附件
@@ -17,10 +17,10 @@ let baseURL =  &#39;&#39;
 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('---------------------')
@@ -85,7 +85,7 @@
 	       <el-table-column label="操作"  min-width="250" fixed="right">
 	         <template slot-scope="scope">
 	           <div @click="addbuss(2,scope.row)" class="tableBtn greens">查看</div>
-	           <div @click="addbuss(3,scope.row)" class="tableBtn greens">宣传资料修改</div>
+	           <div @click="addbuss(3,scope.row)" class="tableBtn greens">修改</div>
 	           <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
 	         </template>
 	       </el-table-column>
@@ -229,7 +229,7 @@
             <wang-editor v-model="formInline.contentCompilation" ref="editor" :height="200"  v-else></wang-editor>
             </el-form-item>
-            <el-form-item :label="index!=3?'宣传资料上传':'宣传资料编辑'"  prop="accountNumber">
+            <el-form-item label="宣传资料上传"  prop="accountNumber">
             <!-- <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
                               :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
                                :auto-upload="true" v-if="index ==3 || index ==1">
@@ -97,7 +97,8 @@
           <el-table-column label="操作" min-width="150" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div v-if='scope.row.dataStatus == 4' @click="OA(scope.row)" class="tableBtn greens">OA</div>
+              <!-- v-if='scope.row.dataStatus == 4' -->
+              <div  @click="OA(scope.row)" class="tableBtn greens">OA</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div>
@@ -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() {
         // 获取当前时间
@@ -2,30 +2,34 @@
 	<view class="page">
 		<view class="title-top">
 			<div class="left" @click="show = true">
-				<text>2024年<u-icon name="arrow-down"></u-icon></text>
+				<text>{{year}}年<u-icon name="arrow-down"></u-icon></text>
 				<u-icon name="arrow-down" style="font-size: 24rpx;margin-left: 10rpx;" />
-				<u-picker v-model="show" mode="time" :params="{year: true}"></u-picker>
+				<u-picker v-model="show" mode="time" :params="{year: true}" @confirm ="change"></u-picker>
 			</div>
-			<div class="right"><u-icon name="rmb" style="font-size: 24rpx;" /><text class="price">6451.00</text></div>
+			<div class="right"><u-icon name="rmb"  class="price" /><text class="price">0</text></div>
 		</view>
+		<view v-if="dataList.length==0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
 		<view class="record-list">
-			<view class="record-item" v-for="(item, index) in dataList" :key="index" @click="toDetail">
+			<view class="record-item" v-for="(item, index) in dataList" :key="index">
 				<view class="info-title">
-					<view class="title">7月</view>
-					<view class="right"><u-icon name="rmb" style="font-size: 24rpx;" /><text class="price">6451.00</text></view>
+					<view class="title">{{item.yue}}月</view>
+					<view class="right"><u-icon name="rmb"  class="price" /><text class="price" >{{item.children | itemnum}}</text></view>
 				</view>
-				<view class="info-items" v-for="(v, i) in item.children" :key="i">
+				<view v-if="item.children.length==0" style="text-align: center;margin-top: 50rpx;margin-bottom: 30rpx;font-size: 24rpx;">暂无缴费数据</view>
+				<view class="info-items" v-for="(v, i) in item.children" :key="i" @click="toDetail(item.children)">
 					<view class="info-item">
-						<view class="left title">{{item.orderNumber}}</view>
-						<view class="right"><u-icon name="rmb" style="font-size: 24rpx;" /><text class="price">500.00</text></view>
+						<view class="left title">{{v.transactionNumber}}</view>
+						<view class="right"><u-icon name="rmb"  class="price" /><text class="price">{{Number(v.actualPaymentFee)/100}}</text></view>
 					</view>
 					<view class="info-item">
-						<view class="left">物业费、服务费、卫生费</view>
-						<view class="right" style="color: #8A8A8A;">共3项</view>
+						<view class="left">
+							<text v-for="(t,a) in v.paymentContent">{{t.itemName}}</text>
+						</view>
+						<view class="right" style="color: #8A8A8A;">共{{v.paymentContent.length}}项</view>
 					</view>
 					<view class="info-item">
-						<view class="left" style="color: #0FBB59;">支付成功</view>
-						<view class="right" style="color: #8A8A8A;">07.11 15:21</view>
+						<view class="left" :style="v.orderStatus=='0'?'color: red;':v.orderStatus=='1'?'color: #0FBB59;':v.orderStatus=='2'?'color: red;':''">{{v.orderStatus=='0'?'待支付':v.orderStatus=='1'?'支付成功':v.orderStatus=='2'?'支付失败':'-'}}</view>
+						<view class="right" style="color: #8A8A8A;">{{v.paymentStartTime}}</view>
 					</view>
 				</view>
 			</view>
@@ -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({
@@ -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' },
 						]
 					},
 //  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 = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 	}
 	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 = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// 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 = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 			success(res) {
 				uni.hideLoading();
 				var code = res.data.code+'';
-				console.log("res",res)
+				// console.log("res",res)
 				switch (code) {
 					case '20001':
 						uni.showModal({