From 48ffeec77a7e78e41c0a2c91e7192a92a9c2dd30 Mon Sep 17 00:00:00 2001 From: bibi <541660090@qq.com> Date: Tue, 28 Dec 2021 16:09:20 +0800 Subject: [PATCH] 1 --- src/permission.js | 6 +- src/router/basic.js | 37 ++- src/router/index.js | 25 +- src/router/manage.js | 62 ++++ src/styles/index.less | 3 + src/views/Basic/Console/settled.vue | 13 - src/views/Basic/{other => adminSet}/index.vue | 0 src/views/Basic/{Console => home}/index.vue | 81 +++++- src/views/Basic/home/newOrder.vue | 181 ++++++++++++ src/views/Basic/home/settled.vue | 233 +++++++++++++++ src/views/Login/index.vue | 271 +++++++++++++++++- .../ChargingManage/ChargingStandard/index.vue | 0 .../ChargingManage/FinancialBill/index.vue | 0 src/views/Manage/CustomerList/index.vue | 0 src/views/Manage/OrderManage/index.vue | 0 .../Manage/SettleRequestManage/index.vue | 0 src/views/Manage/VillageManage/index.vue | 0 17 files changed, 872 insertions(+), 40 deletions(-) create mode 100644 src/router/manage.js delete mode 100644 src/views/Basic/Console/settled.vue rename src/views/Basic/{other => adminSet}/index.vue (100%) rename src/views/Basic/{Console => home}/index.vue (81%) create mode 100644 src/views/Basic/home/newOrder.vue create mode 100644 src/views/Basic/home/settled.vue create mode 100644 src/views/Manage/ChargingManage/ChargingStandard/index.vue create mode 100644 src/views/Manage/ChargingManage/FinancialBill/index.vue create mode 100644 src/views/Manage/CustomerList/index.vue create mode 100644 src/views/Manage/OrderManage/index.vue create mode 100644 src/views/Manage/SettleRequestManage/index.vue create mode 100644 src/views/Manage/VillageManage/index.vue diff --git a/src/permission.js b/src/permission.js index f83558e..39af6dc 100644 --- a/src/permission.js +++ b/src/permission.js @@ -18,5 +18,9 @@ router.beforeEach((to, from, next) => { router.afterEach(() => { NProgress.done() }) - +// router.beforeEach((to, from, next) => { +// // 让页面回到顶部 +// document.documentElement.scrollTop = 0 +// next() +// }) export default router \ No newline at end of file diff --git a/src/router/basic.js b/src/router/basic.js index faba2fe..cd111bb 100644 --- a/src/router/basic.js +++ b/src/router/basic.js @@ -8,31 +8,40 @@ */ export default [ { - path: '/Basic/Console', - name: "Console", - title: "控制台", + path: '/Basic/home', + name: "home", + title: "首页", hide: false, icon: 'container', - component: resolve => require(['@/views/Basic/Console'], resolve), - meta: {title: '控制台'}, + component: resolve => require(['@/views/Basic/home'], resolve), + meta: {title: '首页'}, }, { - path: '/Basic/Console/settled', + path: '/Basic/home/settled', name: "settled", - title: "控制台-入驻企业申请", + title: "首页-入驻企业申请", icon: 'container', hide: true, - component: resolve => require(['@/views/Basic/Console/settled.vue'], resolve), - meta: {title: '控制台-入驻企业申请'}, + component: resolve => require(['@/views/Basic/home/settled.vue'], resolve), + meta: {title: '首页-入驻企业申请'}, }, { - path: '/Basic/other', - name: "other", - title: "其他", + path: '/Basic/home/newOrder', + name: "newOrder", + title: "首页-购买功能", + icon: 'container', + hide: true, + component: resolve => require(['@/views/Basic/home/newOrder.vue'], resolve), + meta: {title: '首页-购买功能'}, + }, + { + path: '/Basic/adminSet', + name: "adminSet", + title: "管理员设置", hide: false, icon: 'container', - component: resolve => require(['@/views/Basic/other'], resolve), - meta: {title: '其他'}, + component: resolve => require(['@/views/Basic/adminSet'], resolve), + meta: {title: '管理员设置'}, }, ] \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 1168c54..a3bf684 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,16 +17,19 @@ Vue.use(Router); import Layout from "@/views/Layout" import basic from "./basic" // 基础功能 - +import manage from "./manage" // 管理平台 const router = [ { path: "/", name: "Layout", title: "外框", component: Layout, - redirect: '/Basic/Console', + redirect: '/Basic/home', meta: {title: '首页'}, - children: [...basic] + children: [ + ...basic, + ...manage + ] }, { path: "/login", @@ -37,5 +40,19 @@ const router = [ ] export default new Router({ - routes: router + mode: 'history', + routes: router, + scrollBehavior(to, from, savedPosition) { + console.log(savedPosition); + if (savedPosition) { + return new Promise((resolve) => { + setTimeout(() => { + console.log('savedPosition', savedPosition) + resolve(savedPosition) + }, 500); + }) + } else { + return { x: 0, y: 0 } + } + } }) \ No newline at end of file diff --git a/src/router/manage.js b/src/router/manage.js new file mode 100644 index 0000000..7a3e21c --- /dev/null +++ b/src/router/manage.js @@ -0,0 +1,62 @@ +export default [ + { + path: '/Manage/SettleRequestManage', + name: "SettleRequestManage", + title: "入驻申请管理", + hide: false, + icon: 'container', + component: resolve => require(['@/views/Manage/SettleRequestManage'], resolve), + meta: {title: '入驻申请管理'}, + }, + { + path: '/Manage/CustomerList', + name: "CustomerList", + title: "客户列表", + hide: false, + icon: 'container', + component: resolve => require(['@/views/Manage/CustomerList'], resolve), + meta: {title: '客户列表'}, + }, + { + path: '/Manage/VillageManage', + name: "VillageManage", + title: "小区管理", + hide: false, + icon: 'container', + component: resolve => require(['@/views/Manage/VillageManage'], resolve), + meta: {title: '小区管理'}, + }, + { + path: '/Manage/OrderManage', + name: "OrderManage", + title: "订单管理", + hide: false, + icon: 'container', + component: resolve => require(['@/views/Manage/OrderManage'], resolve), + meta: {title: '订单管理'}, + }, + { + path: '/Manage/ChargingManage', + name: "ChargingManage", + title: "收费管理", + icon: 'container', + redirect: '/ChargingManage/ChargingStandard', + meta: {title: '收费管理'}, + children: [ + { + path: '/ChargingManage/ChargingStandard', + name: "ChargingStandard", + title: "收费标准", + component: resolve => require(['@/views/Manage/ChargingManage/ChargingStandard'], resolve), + meta: { title: '收费标准' }, + }, + { + path: '/ChargingManage/FinancialBill', + name: "FinancialBill", + title: "财务账单", + component: resolve => require(['@/views/Manage/ChargingManage/FinancialBill'], resolve), + meta: { title: '财务账单' }, + } + ] + }, +] \ No newline at end of file diff --git a/src/styles/index.less b/src/styles/index.less index 6056416..80820dc 100644 --- a/src/styles/index.less +++ b/src/styles/index.less @@ -7,4 +7,7 @@ padding-left:10px; margin-left: 10px; margin-bottom: 10px; +} +#app{ + background: #E5E5E5; } \ No newline at end of file diff --git a/src/views/Basic/Console/settled.vue b/src/views/Basic/Console/settled.vue deleted file mode 100644 index 18b17dc..0000000 --- a/src/views/Basic/Console/settled.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/Basic/other/index.vue b/src/views/Basic/adminSet/index.vue similarity index 100% rename from src/views/Basic/other/index.vue rename to src/views/Basic/adminSet/index.vue diff --git a/src/views/Basic/Console/index.vue b/src/views/Basic/home/index.vue similarity index 81% rename from src/views/Basic/Console/index.vue rename to src/views/Basic/home/index.vue index 309dd13..1ac7a4a 100644 --- a/src/views/Basic/Console/index.vue +++ b/src/views/Basic/home/index.vue @@ -43,7 +43,7 @@ -
+
点击新建小区
@@ -71,6 +71,11 @@ 取消 --> + +
+ 点击新建订单 +
+
当前无订单
@@ -81,6 +86,39 @@
+ +
+
小区信息
+ + + + + + + + + 要求文件大小不超过5mb，支持jpg、png格式 + + +
+
+ + + + +
+ @@ -140,11 +178,23 @@ export default { status:'生效中' } ], + visible: false, + confirmLoading: false, } }, methods:{ settled(){ this.$router.push({name:'settled'}) + }, + addVillage(){ + this.visible=true + }, + handleOk(){}, + handleCancel(){ + this.visible = false + }, + newOrder(){ + this.$router.push({name:'newOrder'}) } } }; @@ -264,8 +314,33 @@ export default { white-space: nowrap; } } - + .addOrder{ + border:1px dashed #9DB7DF; + border-radius: 3%; + width: 80%; + height: 200px; + margin:auto; + margin-top:20px; + .card-b-content-add{ + color:#9DB7DF; + font-size:16px; + cursor:pointer; + text-align: center; + vertical-align: middle; + line-height: 72px; + } + } } } - +.uploadImg{ + background: #0000000A; + border:2px solid #00000029; + color: #00000029; + width: 180px; + height: 120px; + text-align: center; + line-height: 110px; + font-size:60px; + cursor: pointer; +} diff --git a/src/views/Basic/home/newOrder.vue b/src/views/Basic/home/newOrder.vue new file mode 100644 index 0000000..d43c768 --- /dev/null +++ b/src/views/Basic/home/newOrder.vue @@ -0,0 +1,181 @@ + + + + + \ No newline at end of file diff --git a/src/views/Basic/home/settled.vue b/src/views/Basic/home/settled.vue new file mode 100644 index 0000000..99aefb7 --- /dev/null +++ b/src/views/Basic/home/settled.vue @@ -0,0 +1,233 @@ + + + + + \ No newline at end of file diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue index d3bd481..a6750b1 100644 --- a/src/views/Login/index.vue +++ b/src/views/Login/index.vue @@ -7,17 +7,278 @@ * @FilePath: /ansu-business/src/views/Login/index.vue --> diff --git a/src/views/Manage/ChargingManage/ChargingStandard/index.vue b/src/views/Manage/ChargingManage/ChargingStandard/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Manage/ChargingManage/FinancialBill/index.vue b/src/views/Manage/ChargingManage/FinancialBill/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Manage/CustomerList/index.vue b/src/views/Manage/CustomerList/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Manage/OrderManage/index.vue b/src/views/Manage/OrderManage/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Manage/SettleRequestManage/index.vue b/src/views/Manage/SettleRequestManage/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Manage/VillageManage/index.vue b/src/views/Manage/VillageManage/index.vue new file mode 100644 index 0000000..e69de29