diff --git a/src/api/payment/chargeStandardBind/index.js b/src/api/payment/chargeStandardBind/index.js
new file mode 100644
index 0000000..c81d6bd
--- /dev/null
+++ b/src/api/payment/chargeStandardBind/index.js
@@ -0,0 +1,10 @@
+import httpService from "@/request"
+
+// 活动列表
+export function activityList(params) {
+ return httpService({
+ url: `/user/activity/list`,
+ method: 'get',
+ params: params,
+ })
+}
\ No newline at end of file
diff --git a/src/api/payment/chargeStandardManage/index.js b/src/api/payment/chargeStandardManage/index.js
new file mode 100644
index 0000000..e4f6ae6
--- /dev/null
+++ b/src/api/payment/chargeStandardManage/index.js
@@ -0,0 +1,10 @@
+import httpService from "@/request"
+
+// 收费标准列表
+export function chargesList(params) {
+ return httpService({
+ url: `/user/charges/list`,
+ method: 'get',
+ params: params,
+ })
+}
\ No newline at end of file
diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index c96dc29..e473f0b 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -97,6 +97,7 @@
width: 90%;
margin-left: 30px;
margin-top: 20px;
+ height:38px;
margin-bottom: 10px;
"
>
diff --git a/src/views/Payment/ChargeStandardManage/_house/index.vue b/src/views/Payment/ChargeStandardManage/_house/index.vue
deleted file mode 100644
index c8e0af9..0000000
--- a/src/views/Payment/ChargeStandardManage/_house/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
添加费用
-
-
-
- 修改
- 删除
-
-
-
-
-
-
- 批量删除
-
- 批量操作
-
-
-
- {{ `已选择 ${selectedRowKeys.length} 条` }}
-
-
-
-
-
-
-
-
diff --git a/src/views/Payment/ChargeStandardManage/_moment/depend/config.js b/src/views/Payment/ChargeStandardManage/_moment/depend/config.js
deleted file mode 100644
index 5d8ac50..0000000
--- a/src/views/Payment/ChargeStandardManage/_moment/depend/config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-export const formItem = [
- {
- type: 'input',
- label:'费用名称',
- prop:'name',
- placeholder:'请输入'
- },
-]
-export const columns = [
- {
- title: "费用名称",
- dataIndex: "name",
- },
- {
- title: "计费方式",
- dataIndex: "feetype",
- },
- {
- title: "计量方式",
- dataIndex: "type",
- },
- {
- title: "单价",
- dataIndex: "price",
- },
- {
- title: "单位",
- dataIndex: "unit",
- },
- {
- title: "操作",
- dataIndex: "action",
- key: "action",
- width: "180",
- fixed: "right",
- scopedSlots: { customRender: "action" },
- },
-]
-export const pagination = {
- current: 1,
- total: 0,
- pageSize: 10,
- showTotal: (total) => `共 ${total} 条`,
- showSizeChanger: true,
- showQuickJumper: true,
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_moment/depend/form.js b/src/views/Payment/ChargeStandardManage/_moment/depend/form.js
deleted file mode 100644
index f3fd958..0000000
--- a/src/views/Payment/ChargeStandardManage/_moment/depend/form.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const form = {
- id:null,
- brandName: undefined,
-}
-export const rules = {
- brandName:[{required:true,message:'请输入品牌名',trigger:'blur'}],
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_moment/depend/form.vue b/src/views/Payment/ChargeStandardManage/_moment/depend/form.vue
deleted file mode 100644
index e018c60..0000000
--- a/src/views/Payment/ChargeStandardManage/_moment/depend/form.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/Payment/ChargeStandardManage/_moment/index.vue b/src/views/Payment/ChargeStandardManage/_moment/index.vue
deleted file mode 100644
index c8e0af9..0000000
--- a/src/views/Payment/ChargeStandardManage/_moment/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
添加费用
-
-
-
- 修改
- 删除
-
-
-
-
-
-
- 批量删除
-
- 批量操作
-
-
-
- {{ `已选择 ${selectedRowKeys.length} 条` }}
-
-
-
-
-
-
-
-
diff --git a/src/views/Payment/ChargeStandardManage/_parking/depend/config.js b/src/views/Payment/ChargeStandardManage/_parking/depend/config.js
deleted file mode 100644
index 5d8ac50..0000000
--- a/src/views/Payment/ChargeStandardManage/_parking/depend/config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-export const formItem = [
- {
- type: 'input',
- label:'费用名称',
- prop:'name',
- placeholder:'请输入'
- },
-]
-export const columns = [
- {
- title: "费用名称",
- dataIndex: "name",
- },
- {
- title: "计费方式",
- dataIndex: "feetype",
- },
- {
- title: "计量方式",
- dataIndex: "type",
- },
- {
- title: "单价",
- dataIndex: "price",
- },
- {
- title: "单位",
- dataIndex: "unit",
- },
- {
- title: "操作",
- dataIndex: "action",
- key: "action",
- width: "180",
- fixed: "right",
- scopedSlots: { customRender: "action" },
- },
-]
-export const pagination = {
- current: 1,
- total: 0,
- pageSize: 10,
- showTotal: (total) => `共 ${total} 条`,
- showSizeChanger: true,
- showQuickJumper: true,
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_parking/depend/form.js b/src/views/Payment/ChargeStandardManage/_parking/depend/form.js
deleted file mode 100644
index f3fd958..0000000
--- a/src/views/Payment/ChargeStandardManage/_parking/depend/form.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const form = {
- id:null,
- brandName: undefined,
-}
-export const rules = {
- brandName:[{required:true,message:'请输入品牌名',trigger:'blur'}],
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_parking/depend/form.vue b/src/views/Payment/ChargeStandardManage/_parking/depend/form.vue
deleted file mode 100644
index e018c60..0000000
--- a/src/views/Payment/ChargeStandardManage/_parking/depend/form.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/Payment/ChargeStandardManage/_parking/index.vue b/src/views/Payment/ChargeStandardManage/_parking/index.vue
deleted file mode 100644
index c8e0af9..0000000
--- a/src/views/Payment/ChargeStandardManage/_parking/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
添加费用
-
-
-
- 修改
- 删除
-
-
-
-
-
-
- 批量删除
-
- 批量操作
-
-
-
- {{ `已选择 ${selectedRowKeys.length} 条` }}
-
-
-
-
-
-
-
-
diff --git a/src/views/Payment/ChargeStandardManage/_payMeter/depend/config.js b/src/views/Payment/ChargeStandardManage/_payMeter/depend/config.js
deleted file mode 100644
index 5d8ac50..0000000
--- a/src/views/Payment/ChargeStandardManage/_payMeter/depend/config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-export const formItem = [
- {
- type: 'input',
- label:'费用名称',
- prop:'name',
- placeholder:'请输入'
- },
-]
-export const columns = [
- {
- title: "费用名称",
- dataIndex: "name",
- },
- {
- title: "计费方式",
- dataIndex: "feetype",
- },
- {
- title: "计量方式",
- dataIndex: "type",
- },
- {
- title: "单价",
- dataIndex: "price",
- },
- {
- title: "单位",
- dataIndex: "unit",
- },
- {
- title: "操作",
- dataIndex: "action",
- key: "action",
- width: "180",
- fixed: "right",
- scopedSlots: { customRender: "action" },
- },
-]
-export const pagination = {
- current: 1,
- total: 0,
- pageSize: 10,
- showTotal: (total) => `共 ${total} 条`,
- showSizeChanger: true,
- showQuickJumper: true,
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.js b/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.js
deleted file mode 100644
index f3fd958..0000000
--- a/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const form = {
- id:null,
- brandName: undefined,
-}
-export const rules = {
- brandName:[{required:true,message:'请输入品牌名',trigger:'blur'}],
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.vue b/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.vue
deleted file mode 100644
index e018c60..0000000
--- a/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/Payment/ChargeStandardManage/_payMeter/index.vue b/src/views/Payment/ChargeStandardManage/_payMeter/index.vue
deleted file mode 100644
index c8e0af9..0000000
--- a/src/views/Payment/ChargeStandardManage/_payMeter/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
添加费用
-
-
-
- 修改
- 删除
-
-
-
-
-
-
- 批量删除
-
- 批量操作
-
-
-
- {{ `已选择 ${selectedRowKeys.length} 条` }}
-
-
-
-
-
-
-
-
diff --git a/src/views/Payment/ChargeStandardManage/_house/depend/config.js b/src/views/Payment/ChargeStandardManage/depend/config.js
similarity index 100%
rename from src/views/Payment/ChargeStandardManage/_house/depend/config.js
rename to src/views/Payment/ChargeStandardManage/depend/config.js
diff --git a/src/views/Payment/ChargeStandardManage/_house/depend/form.js b/src/views/Payment/ChargeStandardManage/depend/form.js
similarity index 100%
rename from src/views/Payment/ChargeStandardManage/_house/depend/form.js
rename to src/views/Payment/ChargeStandardManage/depend/form.js
diff --git a/src/views/Payment/ChargeStandardManage/_house/depend/form.vue b/src/views/Payment/ChargeStandardManage/depend/form.vue
similarity index 100%
rename from src/views/Payment/ChargeStandardManage/_house/depend/form.vue
rename to src/views/Payment/ChargeStandardManage/depend/form.vue
diff --git a/src/views/Payment/ChargeStandardManage/index.vue b/src/views/Payment/ChargeStandardManage/index.vue
index 4a7d3f4..74ff4eb 100644
--- a/src/views/Payment/ChargeStandardManage/index.vue
+++ b/src/views/Payment/ChargeStandardManage/index.vue
@@ -1,42 +1,137 @@
收费标准管理
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 添加费用
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+ 批量删除
+
+ 批量操作
+
+
+
+ {{ `已选择 ${selectedRowKeys.length} 条` }}
+
+
+
-
+