From 5b377ac1ae2cf945454019fa475b811d84037cc6 Mon Sep 17 00:00:00 2001 From: zx <604444282@qq.com> Date: Wed, 30 Mar 2022 15:47:02 +0800 Subject: [PATCH] zx --- .eslintrc.js | 1 - src/api/basic/console/index.js | 36 + src/api/manage/index.js | 74 +- src/api/public/login/index.js | 10 + src/router/basic.js | 22 +- src/router/index.js | 28 +- src/views/Basic/home/index.vue | 76 +- src/views/Basic/home/newOrder.vue | 383 ++++---- src/views/Layout/index.vue | 18 +- src/views/Login/index.vue | 21 +- .../Manage/AdminSet/PaymentSet/index.vue | 319 +++++++ src/views/Manage/AdminSet/index.vue | 13 + .../ChargingManage/ChargingStandard/index.vue | 2 +- src/views/Manage/CustomerList/_detail.vue | 2 +- src/views/Manage/OrderManage/index.vue | 14 +- .../Manage/SettleRequestManage/_detail.vue | 2 +- src/views/Rule/admin.vue | 832 ++++++++++++++++++ src/views/Rule/adminApp.vue | 200 +++++ src/views/Rule/index.vue | 13 + src/views/Rule/user.vue | 832 ++++++++++++++++++ src/views/Rule/userApp.vue | 200 +++++ vue.config.js | 2 +- 22 files changed, 2890 insertions(+), 210 deletions(-) create mode 100644 src/views/Manage/AdminSet/PaymentSet/index.vue create mode 100644 src/views/Manage/AdminSet/index.vue create mode 100644 src/views/Rule/admin.vue create mode 100644 src/views/Rule/adminApp.vue create mode 100644 src/views/Rule/index.vue create mode 100644 src/views/Rule/user.vue create mode 100644 src/views/Rule/userApp.vue diff --git a/.eslintrc.js b/.eslintrc.js index 2cf5402..2a2bbea 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -18,7 +18,6 @@ module.exports = { "vue" ], "rules": { - indent: ['offset', '2'], 'no-console': 'off', } }; \ No newline at end of file diff --git a/src/api/basic/console/index.js b/src/api/basic/console/index.js index add5ec2..45d80e3 100644 --- a/src/api/basic/console/index.js +++ b/src/api/basic/console/index.js @@ -24,3 +24,39 @@ export function communityInsert(params) { data: params, }) } + +//获取当前账户所有小区信息 +export function getAllCommunityInfo(params) { + return httpService({ + url: `/user/community/getAllCommunityInfo`, + method: 'get', + params: params, + }) +} + +// 创建订单 +export function createOrder(params) { + return httpService({ + url: `/user/order/createOrder`, + method: 'post', + data: params, + }) +} + +// 订单绑定小区(门户网站) +export function userBindingCommunity(params) { + return httpService({ + url: `/user/order/userBindingCommunity`, + method: 'post', + data: params, + }) +} + +// 订单解绑小区(门户网站) +export function userUnbindingCommunity(params) { + return httpService({ + url: `/user/order/userUnbindingCommunity`, + method: 'get', + params: params, + }) +} \ No newline at end of file diff --git a/src/api/manage/index.js b/src/api/manage/index.js index 873017f..63d8b89 100644 --- a/src/api/manage/index.js +++ b/src/api/manage/index.js @@ -84,7 +84,7 @@ export function updateCommunity(params) { // 订单管理-查询所有订单 export function getAllOrder(params) { return httpService({ - url: `/user/financialStatements/list`, + url: `/user/order/list`, method: 'get', params: params, }) @@ -214,4 +214,76 @@ export function postRefund(params) { method: 'post', params: params, }) +} + +// 支付设置-查询所有的支付宝设置信息 +export function alipayList(params) { + return httpService({ + url: `/user/alipaySetting/list`, + method: 'get', + params: params, + }) +} + +// 支付设置-开启/停用支付宝设置信息 +export function isEnable(params) { + return httpService({ + url: `/user/alipaySetting/isEnable`, + method: 'get', + params: params, + }) +} + +// 支付设置-删除支付宝设置信息 +export function alipayDelete(params) { + return httpService({ + url: `/user/alipaySetting/delete`, + method: 'post', + data: params, + }) +} + +// 支付设置-添加支付宝设置信息 +export function alipayInsert(params) { + return httpService({ + url: `/user/alipaySetting/insert`, + method: 'post', + data: params, + }) +} + +// 支付设置-支付宝设置绑定小区 +export function alipayBound(params) { + return httpService({ + url: `/user/alipaySetting/bind`, + method: 'post', + data: params, + }) +} + +// 支付设置-根据支付宝设置主键id查询支付宝设置绑定信息 +export function findBindById(params) { + return httpService({ + url: `/user/alipaySetting/findBindById`, + method: 'get', + params: params, + }) +} + +// 支付设置-根据支付宝设置主键id查询支付宝设置信息 +export function findInfoById(params) { + return httpService({ + url: `/user/alipaySetting/findInfoById`, + method: 'get', + params: params, + }) +} + +// 支付设置-修改支付宝设置信息 +export function alipayUpdate(params) { + return httpService({ + url: `/user/alipaySetting/update`, + method: 'post', + data: params, + }) } \ No newline at end of file diff --git a/src/api/public/login/index.js b/src/api/public/login/index.js index a1c9c42..550239d 100644 --- a/src/api/public/login/index.js +++ b/src/api/public/login/index.js @@ -24,6 +24,16 @@ export function loginTelCode(params) { data: params, }) } + +// 退出 +export function quit(params) { + return httpService({ + url: `/user/quit`, + method: 'post', + data: params, + }) +} + // 获取登录验证码 export function sendTelCode(params) { return httpService({ diff --git a/src/router/basic.js b/src/router/basic.js index ca9280a..44f2aec 100644 --- a/src/router/basic.js +++ b/src/router/basic.js @@ -34,14 +34,24 @@ export default [ component: resolve => require(['@/views/Basic/home/newOrder.vue'], resolve), meta: {title: '购买功能'}, }, - { - path: '/Basic/adminSet', - name: "adminSet", + { + path: '/Manage/AdminSet', + name: "AdminSet", title: "管理员设置", hide: false, - icon: 'team', - component: resolve => require(['@/views/Basic/adminSet'], resolve), + icon: 'setting', + component: resolve => require(['@/views/Manage/AdminSet'], resolve), + redirect: '/Manage/AdminSet/PaymentSet', meta: {title: '管理员设置'}, + children: [ + { + path: '/Manage/AdminSet/PaymentSet', + name: "PaymentSet", + title: "支付设置", + hide: false, + component: resolve => require(['@/views/Manage/AdminSet/PaymentSet'], resolve), + meta: { title: '支付设置' }, + }, + ] }, - ] \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 704550b..3534122 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,11 +36,35 @@ const router = [ name: "Login", title: "登录", component: resolve => require(['@/views/Login'], resolve) - } + }, + { + path: "/admin", + name: "Admin", + title: "小蜜蜂管家端隐私政策", + component: resolve => require(['@/views/Rule/admin.vue'], resolve) + }, + { + path: "/adminApp", + name: "AdminApp", + title: "小蜜蜂管家端用户协议", + component: resolve => require(['@/views/Rule/adminApp.vue'], resolve) + }, + { + path: "/user", + name: "User", + title: "小蜜蜂隐私政策", + component: resolve => require(['@/views/Rule/user.vue'], resolve) + }, + { + path: "/userApp", + name: "UserApp", + title: "住户端APP用户协议", + component: resolve => require(['@/views/Rule/userApp.vue'], resolve) + }, ] export default new Router({ - mode: 'history', + // mode: 'history', routes: router, scrollBehavior(to, from, savedPosition) { // console.log(savedPosition); diff --git a/src/views/Basic/home/index.vue b/src/views/Basic/home/index.vue index 6d67610..1f49a70 100644 --- a/src/views/Basic/home/index.vue +++ b/src/views/Basic/home/index.vue @@ -44,11 +44,11 @@ {{ companyInfo.companyName }} {{ - companyInfo.status === 1 + companyInfo.status == 1 ? "待确认" - : companyInfo.status === 2 + : companyInfo.status == 2 ? "已通过" - : companyInfo.status === 3 + : companyInfo.status == 3 ? "已驳回" : "已取消" }} @@ -90,8 +90,8 @@ :key="index" > - {{ item.status }} + {{ item.status==1?'未绑定':2?'业务受理中':3?'生效中':'已失效'}} 到期 @@ -203,11 +203,19 @@ + + + + {{item.code}} + + + diff --git a/src/views/Basic/home/newOrder.vue b/src/views/Basic/home/newOrder.vue index 3be2767..b1a0c3e 100644 --- a/src/views/Basic/home/newOrder.vue +++ b/src/views/Basic/home/newOrder.vue @@ -1,181 +1,220 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/Layout/index.vue b/src/views/Layout/index.vue index 7188715..9aad9c2 100644 --- a/src/views/Layout/index.vue +++ b/src/views/Layout/index.vue @@ -21,7 +21,7 @@
- + @@ -36,6 +36,7 @@ diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue index 099f354..2fedfec 100644 --- a/src/views/Login/index.vue +++ b/src/views/Login/index.vue @@ -27,7 +27,7 @@ -   我已同意用户协议 +   我已同意用户协议 忘记密码 -   我已同意用户协议 +   我已同意用户协议 忘记密码{ - console.log(res.data); + let data = res.data.type sessionStorage.setItem('info',JSON.stringify(res.data)) - this.$router.push("/"); + if(data == 3) { + this.$router.push("/"); + } else { + this.$router.push('/Manage/SettleRequestManage') + } }) } else { this.$message.error(res.msg); @@ -244,8 +248,13 @@ export default { this.setToken(res.data); this.gettheCity() userInfo().then(res =>{ + let data = res.data.type sessionStorage.setItem('info',JSON.stringify(res.data)) - this.$router.push("/"); + if(data == 3) { + this.$router.push("/"); + } else { + this.$router.push('/Manage/SettleRequestManage') + } }) } else { this.$message.error(res.msg); @@ -294,7 +303,7 @@ export default { allCity().then(res => { this.setCity(res.data); }) - } + }, }, }; diff --git a/src/views/Manage/AdminSet/PaymentSet/index.vue b/src/views/Manage/AdminSet/PaymentSet/index.vue new file mode 100644 index 0000000..f4ad5df --- /dev/null +++ b/src/views/Manage/AdminSet/PaymentSet/index.vue @@ -0,0 +1,319 @@ + + + + + \ No newline at end of file diff --git a/src/views/Manage/AdminSet/index.vue b/src/views/Manage/AdminSet/index.vue new file mode 100644 index 0000000..152b171 --- /dev/null +++ b/src/views/Manage/AdminSet/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/Manage/ChargingManage/ChargingStandard/index.vue b/src/views/Manage/ChargingManage/ChargingStandard/index.vue index e305aa9..ff9f246 100644 --- a/src/views/Manage/ChargingManage/ChargingStandard/index.vue +++ b/src/views/Manage/ChargingManage/ChargingStandard/index.vue @@ -68,7 +68,7 @@
{{it.years}}年{{it.months}}个月{{it.days}}天 - +
diff --git a/src/views/Manage/CustomerList/_detail.vue b/src/views/Manage/CustomerList/_detail.vue index 21a95f1..35216f7 100644 --- a/src/views/Manage/CustomerList/_detail.vue +++ b/src/views/Manage/CustomerList/_detail.vue @@ -1,7 +1,7 @@