From dd2c2983c64ea499fb7ea23500c01cb65366db52 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 4 Jul 2025 13:14:51 +0800
Subject: [PATCH] 优化缴费页面

---
 src/api/fee/payFeeOrderApi.js            | 343 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/fee/payFeeOrderResult.vue |  11 +++++------
 src/views/fee/payFeeOrderList.vue        |   5 +++--
 src/views/layout/layout.vue              |   6 +++---
 4 files changed, 157 insertions(+), 208 deletions(-)

diff --git a/src/api/fee/payFeeOrderApi.js b/src/api/fee/payFeeOrderApi.js
index d5d94e9..dc59e82 100644
--- a/src/api/fee/payFeeOrderApi.js
+++ b/src/api/fee/payFeeOrderApi.js
@@ -3,309 +3,258 @@ import { getCommunityId } from '@/api/community/communityApi'
 
 // 查询费用对象信息
 export function listFeeObj(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/feeApi/listFeeObj',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/feeApi/listFeeObj',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 计算费用折扣
 export function computeFeeDiscount(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/feeDiscount/computeFeeDiscount',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/feeDiscount/computeFeeDiscount',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 计算缴费优惠券
 export function computePayFeeCoupon(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/coupon.computePayFeeCoupon',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/coupon/computePayFeeCoupon',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 查询用户账户
 export function queryCommunityOwnerAccount(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/account.queryCommunityOwnerAccount',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/account/queryCommunityOwnerAccount',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 查询押金信息
 export function queryFeeDeposit(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/fee.queryFeeDeposit',
-        method: 'get',
-        params: {
-          ...params,
-          communityId,
-          state: '1400'
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/fee/queryFeeDeposit',
+      method: 'get',
+      params: { ...params, communityId, state: '1400' }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 退押金
 export function refundFeeDeposit(data) {
-  return new Promise( (resolve, reject) => {
-    try {
-      data.communityId =  getCommunityId()
-      const response =  request({
-        url: '/fee.refundFeeDeposit',
-        method: 'post',
-        data
-      })
+  return new Promise((resolve, reject) => {
+    data.communityId = getCommunityId()
+    request({
+      url: '/fee/refundFeeDeposit',
+      method: 'post',
+      data
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 缴费
 export function payFee(data) {
-  return new Promise( (resolve, reject) => {
-    try {
-      data.communityId =  getCommunityId()
-      const response =  request({
-        url: '/fee.payFee',
-        method: 'post',
-        data
-      })
+  return new Promise((resolve, reject) => {
+    data.communityId = getCommunityId()
+    request({
+      url: '/fee/payFee',
+      method: 'post',
+      data
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 扫码支付
 export function qrCodePayment(data) {
-  return new Promise( (resolve, reject) => {
-    try {
-      data.communityId =  getCommunityId()
-      data.subServiceCode = 'fee.payFee'
-      const response =  request({
-        url: '/payment.qrCodePayment',
-        method: 'post',
-        data
-      })
+  return new Promise((resolve, reject) => {
+    data.communityId = getCommunityId()
+    data.subServiceCode = 'fee.payFee'
+    request({
+      url: '/payment/qrCodePayment',
+      method: 'post',
+      data
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 检查支付状态
 export function checkPayFinish(data) {
-  return new Promise( (resolve, reject) => {
-    try {
-      data.communityId =  getCommunityId()
-      data.subServiceCode = 'fee.payFee'
-      const response =  request({
-        url: '/payment.checkPayFinish',
-        method: 'post',
-        data
-      })
+  return new Promise((resolve, reject) => {
+    data.communityId = getCommunityId()
+    data.subServiceCode = 'fee.payFee'
+    request({
+      url: '/payment/checkPayFinish',
+      method: 'post',
+      data
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 查询收据
 export function queryFeeReceipt(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/feeReceipt/queryFeeReceipt',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/feeReceipt/queryFeeReceipt',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 查询打印页面
 export function listFeePrintPages(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/feePrintPage.listFeePrintPage',
-        method: 'get',
-        params: {
-          ...params,
-          communityId,
-          state: 'T'
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/feePrintPage.listFeePrintPage',
+      method: 'get',
+      params: { ...params, communityId, state: 'T' }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 业主预存账户
 export function ownerPrestoreAccount(data) {
-  return new Promise( (resolve, reject) => {
-    try {
-      data.communityId =  getCommunityId()
-      const response =  request({
-        url: '/account.ownerPrestoreAccount',
-        method: 'post',
-        data
-      })
+  return new Promise((resolve, reject) => {
+    data.communityId = getCommunityId()
+    request({
+      url: '/account/ownerPrestoreAccount',
+      method: 'post',
+      data
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 查询房间信息
 export function queryRooms(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/room.queryRooms',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/room/queryRooms',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 查询费用信息
 export function listFee(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/fee.listFee',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/fee/listFee',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 查询费用配置
 export function listFeeConfigs(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/feeConfig.listFeeConfigs',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/feeConfig/listFeeConfigs',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
 
 // 计算缴费积分
 export function computePayFeeIntegral(params) {
-  return new Promise( (resolve, reject) => {
-    try {
-      const communityId =  getCommunityId()
-      const response =  request({
-        url: '/integral.computePayFeeIntegral',
-        method: 'get',
-        params: {
-          ...params,
-          communityId
-        }
-      })
+  return new Promise((resolve, reject) => {
+    const communityId = getCommunityId()
+    request({
+      url: '/integral/computePayFeeIntegral',
+      method: 'get',
+      params: { ...params, communityId }
+    }).then(response => {
       resolve(response.data)
-    } catch (error) {
+    }).catch(error => {
       reject(error)
-    }
+    })
   })
 }
\ No newline at end of file
diff --git a/src/components/fee/payFeeOrderResult.vue b/src/components/fee/payFeeOrderResult.vue
index 40ca510..6cc82ba 100644
--- a/src/components/fee/payFeeOrderResult.vue
+++ b/src/components/fee/payFeeOrderResult.vue
@@ -40,6 +40,7 @@
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
+import { listFeePrintPages } from '@/api/fee/payFeeOrderApi'
 
 export default {
   name: 'PayFeeOrderResult',
@@ -86,18 +87,16 @@ export default {
     },
     async listFeePrintPages() {
       try {
-        const communityId = await getCommunityId()
-        const response = await this.$http.get('/feePrintPage.listFeePrintPage', {
-          params: {
+        const communityId = getCommunityId()
+        const response = await listFeePrintPages({
             page: 1,
             row: 1,
             state: 'T',
             communityId
-          }
         })
         
-        if (response.data.data && response.data.data.length > 0) {
-          this.printUrl = response.data.data[0].url
+        if (response.data && response.data.length > 0) {
+          this.printUrl = response.data[0].url
         }
       } catch (error) {
         console.error('获取打印页面失败:', error)
diff --git a/src/views/fee/payFeeOrderList.vue b/src/views/fee/payFeeOrderList.vue
index e6e3ad4..35b03aa 100644
--- a/src/views/fee/payFeeOrderList.vue
+++ b/src/views/fee/payFeeOrderList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="pay-fee-order-container">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('payFeeOrder.title') }}</span>
         <el-button type="primary" size="small" style="float: right;" @click="goBack">
           <i class="el-icon-close"></i>
@@ -11,7 +11,7 @@
 
       <el-row :gutter="20">
         <el-col :span="14" style="border-right: 1px solid #f4f4f4; padding-left: 30px;">
-          <el-form label-width="120px">
+          <el-form label-width="120px" class="text-left">
             <el-row>
               <el-col :span="12">
                 <el-form-item :label="$t('payFeeOrder.feeId')">
@@ -378,6 +378,7 @@ export default {
         param.params.customStartTime = this.payFeeOrderInfo.customStartTime
       }
       const listRoomData = await listFeeObj(param)
+      console.log('listRoomData', listRoomData)
       //发送get请求
 
       if (Object.prototype.hasOwnProperty.call(listRoomData.data, 'custEndTime')) {
diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue
index 1cc8217..86d8c42 100644
--- a/src/views/layout/layout.vue
+++ b/src/views/layout/layout.vue
@@ -7,7 +7,7 @@
         <el-menu mode="horizontal" :default-active="activeMenu" class="header-menu" background-color="#1e2132"
           text-color="#fff" active-text-color="#409EFF">
           <el-menu-item :index="item.caId" v-for="(item, index) in catalogs" :key="index"
-            @click="_changeMenuCatalog(item)">{{ item.name }}</el-menu-item>
+            @click="_changeMenuCatalog(item, true)">{{ item.name }}</el-menu-item>
         </el-menu>
       </div>
       <div class="header-right">
@@ -150,7 +150,7 @@ export default {
         this.loading = false
       }
     },
-    _changeMenuCatalog(_catalog) {
+    _changeMenuCatalog(_catalog, _isJump) {
       this.activeMenu = _catalog.caId;
 
       if (_catalog.caId === '1') {
@@ -166,7 +166,7 @@ export default {
         return;
       }
       console.log(_catalog)
-      if (_catalog.url != '#') {
+      if (_catalog.url != '#' && _isJump) {
         this._gotoPage(_catalog.url, _catalog.name)
         //return;
       }
--
libgit2 0.21.4