diff --git a/.env.development b/.env.development index 2bd86fc..cd182d8 100644 --- a/.env.development +++ b/.env.development @@ -9,9 +9,9 @@ VITE_APP_ENV='development' # 开发环境 VITE_APP_BASE_API='/dev-api' # # 开发环境 接口代理地址 -VITE_APP_PROXY_API='http://192.168.1.222:8080' +#VITE_APP_PROXY_API='http://192.168.1.222:8080' # 开发环境 接口代理地址 -#VITE_APP_PROXY_API='http://192.168.1.6:8080' +VITE_APP_PROXY_API='http://192.168.1.6:8080' # 图片基础地址 VITE_IMG_URL='http://192.168.1.222:8080' diff --git a/src/api/system/Payment/index.ts b/src/api/system/Payment/index.ts index d00d380..5f7f045 100644 --- a/src/api/system/Payment/index.ts +++ b/src/api/system/Payment/index.ts @@ -74,8 +74,18 @@ export interface PayMentMethod { 'wechatPercent': string; 'alipayAmount': string; 'alipayPercent': string; - 'offlineAmount': string; - 'offlinePercent': string; + 'yidangAmount': string; + 'yidangPercent': string; + 'cashAmount': string; + 'cashPercent': string; + 'unionPayAmount': string; + 'unionPayPercent': string; + 'transferAmount': string; + 'transferPercent': string; + 'depositOffsetAmount': string; + 'depositOffsetAmountPercent': string; + 'propertyOffsetAmount': string; + 'propertyOffsetAmountPercent': string; } // 缴费方式 export const payment_methodApi = (datetime?: string): AxiosPromise => { diff --git a/src/views/system/resident/ResidentMain.vue b/src/views/system/resident/ResidentMain.vue index 75e27ab..238e913 100644 --- a/src/views/system/resident/ResidentMain.vue +++ b/src/views/system/resident/ResidentMain.vue @@ -85,7 +85,14 @@
审批意见
- +
审核通过 审核不通过 diff --git a/src/views/system/statistics/Payment/index.vue b/src/views/system/statistics/Payment/index.vue index 135c2bf..a2b2e9d 100644 --- a/src/views/system/statistics/Payment/index.vue +++ b/src/views/system/statistics/Payment/index.vue @@ -183,7 +183,12 @@ const options2 = shallowRef({ data: [ { value: 0, name: '支付宝', itemStyle: { color: '#0a74fe' } }, { value: 0, name: '微信', itemStyle: { color: '#f74043' } }, - { value: 0, name: '线下', itemStyle: { color: '#fcd152' } } + { value: 0, name: '宜当付', itemStyle: { color: '#fcd152' } }, + { value: 0, name: '现金', itemStyle: { color: '#fcd152' } }, + { value: 0, name: '银联', itemStyle: { color: '#fcd152' } }, + { value: 0, name: '转账', itemStyle: { color: '#fcd152' } }, + { value: 0, name: '押金抵顶', itemStyle: { color: '#fcd152' } }, + { value: 0, name: '房产抵顶', itemStyle: { color: '#fcd152' } } ] } ] @@ -214,7 +219,12 @@ function updatePayMethod(dataFrom: PayMentMethod): EChartsOption { data: [ { value: Number(dataFrom.alipayAmount) ?? 0, name: '支付宝', itemStyle: { color: '#0a74fe' } }, { value: Number(dataFrom.wechatAmount) ?? 0, name: '微信', itemStyle: { color: '#f74043' } }, - { value: Number(dataFrom.offlineAmount) ?? 0, name: '线下', itemStyle: { color: '#fcd152' } } + { value: Number(dataFrom.yidangAmount) ?? 0, name: '宜当付', itemStyle: { color: '#fcd152' } }, + { value: Number(dataFrom.cashAmount) ?? 0, name: '现金', itemStyle: { color: '#4b5cc4' } }, + { value: Number(dataFrom.unionPayAmount) ?? 0, name: '银联', itemStyle: { color: '#8d4bbb' } }, + { value: Number(dataFrom.transferAmount) ?? 0, name: '转账', itemStyle: { color: '#424c50' } }, + { value: Number(dataFrom.depositOffsetAmount) ?? 0, name: '押金抵顶', itemStyle: { color: '#00bc12' } }, + { value: Number(dataFrom.propertyOffsetAmount) ?? 0, name: '房产抵顶', itemStyle: { color: '#ff7500' } } ] } ] @@ -504,8 +514,17 @@ const payMethodFrom = ref({ 'wechatPercent': '0', 'alipayAmount': '0', 'alipayPercent': '0', - 'offlineAmount': '0', - 'offlinePercent': '0' + 'yidangAmount': '0', + 'yidangPercent': '0', + 'cashAmount': '0', + 'cashPercent': '0', + 'unionPayPercent': '0', + 'transferAmount': '0', + 'transferPercent': '0', + 'depositOffsetAmount': '0', + 'depositOffsetAmountPercent': '0', + 'propertyOffsetAmount': '0', + 'propertyOffsetAmountPercent': '0' }); function getList() {