From d03b0320367c9ddd85e827efc99856cbf4a908dd Mon Sep 17 00:00:00 2001
From: bibi <541660090@qq.com>
Date: Fri, 11 Feb 2022 16:33:56 +0800
Subject: [PATCH] 1
---
.env.production | 4 +-
.eslintrc.js | 24 ++
babel.config.js | 6 +-
src/App.vue | 12 +-
src/api/basic/index.js | 10 +-
src/api/login/index.js | 10 -
src/api/public/login/index.js | 34 +++
src/components/drawer/index.vue | 26 +-
src/components/table/index.vue | 94 +++----
src/main.js | 15 +-
src/mixins/index.js | 4 +-
src/request/index.js | 2 +-
src/router/basic.js | 72 ++---
src/router/index.js | 68 ++---
src/router/manage.js | 156 +++++------
src/store/actions.js | 3 -
src/store/getters.js | 3 -
src/store/index.js | 10 +-
src/store/mutations.js | 4 -
src/store/state.js | 1 -
src/styles/index.less | 8 +-
src/utils/util.js | 40 +++
src/views/Basic/home/depend/form.vue | 2 +-
src/views/Basic/home/index.vue | 146 +++++-----
src/views/Basic/home/newOrder.vue | 118 ++++----
src/views/Basic/home/settled.vue | 118 ++++----
src/views/Layout/index.vue | 88 +++---
src/views/Layout/ost.js | 72 ++---
src/views/Layout/yMenu/index.vue | 210 +++++++-------
src/views/Login/index.vue | 65 +++--
src/views/Manage/CustomerList/_detail.vue | 46 ++--
src/views/Manage/CustomerList/index.vue | 234 ++++++++--------
.../Manage/SettleRequestManage/_detail.vue | 46 ++--
.../Manage/SettleRequestManage/index.vue | 236 ++++++++--------
src/views/Manage/VillageManage/index.vue | 256 +++++++++---------
vue.config.js | 8 +-
36 files changed, 1176 insertions(+), 1075 deletions(-)
create mode 100644 .eslintrc.js
delete mode 100644 src/api/login/index.js
create mode 100644 src/api/public/login/index.js
create mode 100644 src/utils/util.js
diff --git a/.env.production b/.env.production
index 13d9127..f6fcf28 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,3 @@
NODE_ENV = 'production'
-VUE_APP_URL = 'https://saas.kaidalai.cn/api/admin/'
-VUE_APP_STATIC = 'https://saas.kaidalai.cn/api/admin/'
\ No newline at end of file
+VUE_APP_URL = 'https://saas.kaidalai.cn/api/admin'
+VUE_APP_STATIC = 'https://saas.kaidalai.cn/api/admin'
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..0c40f7a
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,24 @@
+module.exports = {
+ "env": {
+ "browser": true,
+ "es6": true
+ },
+ "extends": [
+ "plugin:vue/essential",
+ ],
+ "globals": {
+ "Atomics": "readonly",
+ "SharedArrayBuffer": "readonly"
+ },
+ "parserOptions": {
+ "ecmaVersion": 2018,
+ "sourceType": "module"
+ },
+ "plugins": [
+ "vue"
+ ],
+ "rules": {
+ indent: ['error', 'tab'],
+ 'no-console': 'off',
+ }
+};
\ No newline at end of file
diff --git a/babel.config.js b/babel.config.js
index e955840..414e4ac 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +1,5 @@
module.exports = {
- presets: [
- '@vue/cli-plugin-babel/preset'
- ]
+ presets: [
+ '@vue/cli-plugin-babel/preset'
+ ]
}
diff --git a/src/App.vue b/src/App.vue
index a530f12..a9f9fed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,12 +17,12 @@
diff --git a/src/api/basic/index.js b/src/api/basic/index.js
index 8acfc97..07b7e96 100644
--- a/src/api/basic/index.js
+++ b/src/api/basic/index.js
@@ -2,9 +2,9 @@ import httpService from "@/request"
// 获取预报列表
export function functionName(params) {
- return httpService({
- url: `url`,
- method: 'post',
- data: params,
- })
+ return httpService({
+ url: `url`,
+ method: 'post',
+ data: params,
+ })
}
diff --git a/src/api/login/index.js b/src/api/login/index.js
deleted file mode 100644
index d817180..0000000
--- a/src/api/login/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import httpService from "@/request"
-
-// 登录
-export function loginTel(params) {
- return httpService({
- url: `/manage/loginTelCode`,
- method: 'post',
- data: params,
- })
-}
diff --git a/src/api/public/login/index.js b/src/api/public/login/index.js
new file mode 100644
index 0000000..bfca87c
--- /dev/null
+++ b/src/api/public/login/index.js
@@ -0,0 +1,34 @@
+import httpService from "@/request"
+
+// 注册
+export function register(params) {
+ return httpService({
+ url: `/register`,
+ method: 'post',
+ data: params,
+ })
+}
+// 登录
+export function loginPWD(params) {
+ return httpService({
+ url: `/loginPWD`,
+ method: 'post',
+ data: params,
+ })
+}
+// 登录
+export function loginTelCode(params) {
+ return httpService({
+ url: `/loginTelCode`,
+ method: 'post',
+ data: params,
+ })
+}
+// 验证码
+export function sendTelCode(params) {
+ return httpService({
+ url: `/sendTelCode`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/src/components/drawer/index.vue b/src/components/drawer/index.vue
index 5a1dfbc..66b465b 100644
--- a/src/components/drawer/index.vue
+++ b/src/components/drawer/index.vue
@@ -19,18 +19,18 @@
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index abcd728..d42ce6e 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -56,16 +56,16 @@
diff --git a/src/main.js b/src/main.js
index 36fe0ab..3d2ab5b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,9 +11,12 @@ import App from './App.vue'
import './styles/index.less';
import mixins from "@/mixins"
import Antd from 'ant-design-vue';
+import util from '@/utils/util.js'
import 'ant-design-vue/dist/antd.css';
+
Vue.use(Antd);
Vue.use(mixins);
+Vue.use(util);
import store from "@/store";
import router from "@/permission";
Vue.config.productionTip = false
@@ -23,13 +26,13 @@ import commonTable from './components/table'
Vue.component('commonTable', commonTable)
router.beforeEach((to, from, next) => {
- // 让页面回到顶部
- document.documentElement.scrollTop = 0
- next()
+ // 让页面回到顶部
+ document.documentElement.scrollTop = 0
+ next()
})
new Vue({
- render: h => h(App),
- router,
- store
+ render: h => h(App),
+ router,
+ store
}).$mount('#app')
diff --git a/src/mixins/index.js b/src/mixins/index.js
index 03a8b12..f0e6b28 100644
--- a/src/mixins/index.js
+++ b/src/mixins/index.js
@@ -12,10 +12,10 @@ export default {
install(Vue) {
Vue.mixin({
computed: {
- ...mapGetters(['getToken','getCommunityCode','getSelectedKeys', 'getOpenKeys'])
+ ...mapGetters(['getToken','getSelectedKeys', 'getOpenKeys'])
},
methods: {
- ...mapActions(['setToken','setCommunityCode','setSelectedKeys', 'setOpenKeys'])
+ ...mapActions(['setToken','setSelectedKeys', 'setOpenKeys'])
}
})
}
diff --git a/src/request/index.js b/src/request/index.js
index ac3f56d..76279ea 100644
--- a/src/request/index.js
+++ b/src/request/index.js
@@ -35,7 +35,7 @@ httpService.interceptors.request.use(config => {
const rqData = filterRequestData(config.data);
// post 'Content-Type' === 'application/x-www-form-urlencoded'
config.headers['Content-Type'] = "application/json";
- config.headers['manage-login-token'] = store.getters.getToken;
+ config.headers['admin-login-token'] = store.getters.getToken;
// config.headers['device-type'] = "web";
if(config.method === 'post') {
config.data = rqData;
diff --git a/src/router/basic.js b/src/router/basic.js
index 61066ff..ca9280a 100644
--- a/src/router/basic.js
+++ b/src/router/basic.js
@@ -7,41 +7,41 @@
* @FilePath: /LittleBeeSaas/src/router/basic.js
*/
export default [
- {
- path: '/Basic/home',
- name: "home",
- title: "首页",
- hide: false,
- icon: 'container',
- component: resolve => require(['@/views/Basic/home'], resolve),
- meta: {title: '首页'},
- },
- {
- path: '/Basic/home/settled',
- name: "settled",
- title: "首页-入驻企业申请",
- icon: 'container',
- hide: true,
- component: resolve => require(['@/views/Basic/home/settled.vue'], resolve),
- meta: {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: 'team',
- component: resolve => require(['@/views/Basic/adminSet'], resolve),
- meta: {title: '管理员设置'},
- },
+ {
+ path: '/Basic/home',
+ name: "home",
+ title: "首页",
+ hide: false,
+ icon: 'container',
+ component: resolve => require(['@/views/Basic/home'], resolve),
+ meta: {title: '首页'},
+ },
+ {
+ path: '/Basic/home/settled',
+ name: "settled",
+ title: "首页-入驻企业申请",
+ icon: 'container',
+ hide: true,
+ component: resolve => require(['@/views/Basic/home/settled.vue'], resolve),
+ meta: {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: 'team',
+ 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 2c61695..704550b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,7 +11,7 @@ import Router from "vue-router"
const originalPush = Router.prototype.push
Router.prototype.push = function push(location) {
- return originalPush.call(this, location).catch(err => err)
+ return originalPush.call(this, location).catch(err => err)
}
Vue.use(Router);
@@ -19,40 +19,40 @@ import Layout from "@/views/Layout"
import basic from "./basic" // 基础功能
import manage from "./manage" // 管理平台
const router = [
- {
- path: "/",
- name: "Layout",
- title: "外框",
- component: Layout,
- redirect: '/Basic/home',
- meta: {title: '首页'},
- children: [
- ...basic,
- ...manage
- ]
- },
- {
- path: "/login",
- name: "Login",
- title: "登录",
- component: resolve => require(['@/views/Login'], resolve)
- }
+ {
+ path: "/",
+ name: "Layout",
+ title: "外框",
+ component: Layout,
+ redirect: '/Basic/home',
+ meta: {title: '首页'},
+ children: [
+ ...basic,
+ ...manage
+ ]
+ },
+ {
+ path: "/login",
+ name: "Login",
+ title: "登录",
+ component: resolve => require(['@/views/Login'], resolve)
+ }
]
export default new 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 }
- }
- }
+ 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
index 7792daf..a7c4ff2 100644
--- a/src/router/manage.js
+++ b/src/router/manage.js
@@ -1,80 +1,80 @@
export default [
- {
- path: '/Manage/SettleRequestManage',
- name: "SettleRequestManage",
- title: "入驻申请管理",
- hide: false,
- icon: 'contacts',
- component: resolve => require(['@/views/Manage/SettleRequestManage'], resolve),
- meta: {title: '入驻申请管理'},
- },
- {
- path: '/Manage/SettleRequestManage/settle_detail',
- name: "settle_detail",
- title: "查看详情",
- hide: true,
- icon: 'container',
- component: resolve => require(['@/views/Manage/SettleRequestManage/_detail'], resolve),
- meta: {title: '查看详情'},
- },
- {
- path: '/Manage/CustomerList',
- name: "CustomerList",
- title: "客户列表",
- hide: false,
- icon: 'user',
- component: resolve => require(['@/views/Manage/CustomerList'], resolve),
- meta: {title: '客户列表'},
- },
- {
- path: '/Manage/SettleRequestManage/customer_detail',
- name: "customer_detail",
- title: "查看详情",
- hide: true,
- icon: 'container',
- component: resolve => require(['@/views/Manage/CustomerList/_detail'], resolve),
- meta: {title: '查看详情'},
- },
- {
- path: '/Manage/VillageManage',
- name: "VillageManage",
- title: "小区管理",
- hide: false,
- icon: 'home',
- component: resolve => require(['@/views/Manage/VillageManage'], resolve),
- meta: {title: '小区管理'},
- },
- {
- path: '/Manage/OrderManage',
- name: "OrderManage",
- title: "订单管理",
- hide: false,
- icon: 'exception',
- component: resolve => require(['@/views/Manage/OrderManage'], resolve),
- meta: {title: '订单管理'},
- },
- {
- path: '/Manage/ChargingManage',
- name: "ChargingManage",
- title: "收费管理",
- icon: 'pay-circle',
- 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: '财务账单' },
- }
- ]
- },
+ {
+ path: '/Manage/SettleRequestManage',
+ name: "SettleRequestManage",
+ title: "入驻申请管理",
+ hide: false,
+ icon: 'contacts',
+ component: resolve => require(['@/views/Manage/SettleRequestManage'], resolve),
+ meta: {title: '入驻申请管理'},
+ },
+ {
+ path: '/Manage/SettleRequestManage/settle_detail',
+ name: "settle_detail",
+ title: "查看详情",
+ hide: true,
+ icon: 'container',
+ component: resolve => require(['@/views/Manage/SettleRequestManage/_detail'], resolve),
+ meta: {title: '查看详情'},
+ },
+ {
+ path: '/Manage/CustomerList',
+ name: "CustomerList",
+ title: "客户列表",
+ hide: false,
+ icon: 'user',
+ component: resolve => require(['@/views/Manage/CustomerList'], resolve),
+ meta: {title: '客户列表'},
+ },
+ {
+ path: '/Manage/SettleRequestManage/customer_detail',
+ name: "customer_detail",
+ title: "查看详情",
+ hide: true,
+ icon: 'container',
+ component: resolve => require(['@/views/Manage/CustomerList/_detail'], resolve),
+ meta: {title: '查看详情'},
+ },
+ {
+ path: '/Manage/VillageManage',
+ name: "VillageManage",
+ title: "小区管理",
+ hide: false,
+ icon: 'home',
+ component: resolve => require(['@/views/Manage/VillageManage'], resolve),
+ meta: {title: '小区管理'},
+ },
+ {
+ path: '/Manage/OrderManage',
+ name: "OrderManage",
+ title: "订单管理",
+ hide: false,
+ icon: 'exception',
+ component: resolve => require(['@/views/Manage/OrderManage'], resolve),
+ meta: {title: '订单管理'},
+ },
+ {
+ path: '/Manage/ChargingManage',
+ name: "ChargingManage",
+ title: "收费管理",
+ icon: 'pay-circle',
+ 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/store/actions.js b/src/store/actions.js
index e4f1be1..7707b09 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -10,9 +10,6 @@ const actions = {
setToken: ({commit}, log) => {
commit('setToken', log)
},
- setCommunityCode: ({commit}, log) => {
- commit('setCommunityCode', log)
- },
setSelectedKeys: ({commit}, log) => {
commit('setSelectedKeys', log)
},
diff --git a/src/store/getters.js b/src/store/getters.js
index 9f79d7f..3afdcb1 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -16,9 +16,6 @@ const getters = {
getToken(state) {
return state.token
},
- getCommunityCode(state) {
- return state.communityCode
- },
}
export default getters
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 57af910..ecc762d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -14,10 +14,10 @@ import actions from "./actions";
import mutations from "./mutations";
import getters from "./getters";
import state from "./state";
- const store = new Vuex.Store({
- state,
- actions,
- mutations,
- getters
+const store = new Vuex.Store({
+ state,
+ actions,
+ mutations,
+ getters
})
export default store
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 145f2eb..ef4d578 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -21,10 +21,6 @@ const mutations = {
state.token = log;
sessionStorage.setItem('token', log);
},
- setCommunityCode: (state, log) => {
- state.communityCode = log;
- sessionStorage.setItem('communityCode', log);
- },
}
export default mutations
\ No newline at end of file
diff --git a/src/store/state.js b/src/store/state.js
index 8071246..b521a1a 100644
--- a/src/store/state.js
+++ b/src/store/state.js
@@ -10,6 +10,5 @@ const state = {
selectedKeys: JSON.parse(sessionStorage.getItem('selectedKeys')) || ['/'],
openKeys: JSON.parse(sessionStorage.getItem('openKeys')) || [],
token: sessionStorage.getItem('token') || "",
- communityCode: sessionStorage.getItem('communityCode') || "",
}
export default state
\ No newline at end of file
diff --git a/src/styles/index.less b/src/styles/index.less
index f827b5c..89c619d 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -20,7 +20,13 @@
margin-left : 10px;
margin-bottom: 10px;
}
-
+.back-btn{
+ font-size: 16px;
+ line-height: 22px;
+ color: #000000D9;
+ font-weight: 500;
+ cursor: pointer;
+}
// 表格
#commonTable {
margin: 24px;
diff --git a/src/utils/util.js b/src/utils/util.js
new file mode 100644
index 0000000..3543d96
--- /dev/null
+++ b/src/utils/util.js
@@ -0,0 +1,40 @@
+import axios from 'axios'
+import qs from 'qs'
+export default {
+ install: function (Vue) {
+ //axios
+ Vue.prototype.$axios = axios
+ Vue.prototype.qs = qs
+ // 上传
+ Vue.prototype.$upload = process.env.VUE_APP_URL + 'admin/user/upload/uploadImg'
+ // 静态地址
+ Vue.prototype.$ImgUrl = (src) => {
+ return process.env.VUE_APP_STATIC + '/' + src
+ }
+ // 时间格式化
+ Vue.prototype.formatDate = (time, fmt) => {
+ if (time > 0) {
+ let date = new Date(time * 1000)
+ if (/(y+)/.test(fmt)) {
+ fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+ }
+ let o = {
+ 'M+': date.getMonth() + 1,
+ 'd+': date.getDate(),
+ 'h+': date.getHours(),
+ 'm+': date.getMinutes(),
+ 's+': date.getSeconds()
+ }
+ for (let k in o) {
+ if (new RegExp(`(${k})`).test(fmt)) {
+ let str = o[k] + ''
+ fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : ('00' + str).substr(str.length))
+ }
+ }
+ return fmt
+ } else {
+ return ''
+ }
+ }
+ }
+}
diff --git a/src/views/Basic/home/depend/form.vue b/src/views/Basic/home/depend/form.vue
index bb9aff5..9c7b90e 100644
--- a/src/views/Basic/home/depend/form.vue
+++ b/src/views/Basic/home/depend/form.vue
@@ -281,7 +281,7 @@ export default {
cascVal:[],
telephoneNum:"",
uploadHeaders: {
- "manage-login-token": store.getters.getToken,
+ "admin-login-token": store.getters.getToken,
},
sexOption: [
{
diff --git a/src/views/Basic/home/index.vue b/src/views/Basic/home/index.vue
index 1ac7a4a..7f5c48d 100644
--- a/src/views/Basic/home/index.vue
+++ b/src/views/Basic/home/index.vue
@@ -124,79 +124,79 @@
diff --git a/src/views/Basic/home/newOrder.vue b/src/views/Basic/home/newOrder.vue
index d43c768..bbc8f54 100644
--- a/src/views/Basic/home/newOrder.vue
+++ b/src/views/Basic/home/newOrder.vue
@@ -92,65 +92,65 @@
diff --git a/src/views/Basic/home/settled.vue b/src/views/Basic/home/settled.vue
index 99aefb7..dd45552 100644
--- a/src/views/Basic/home/settled.vue
+++ b/src/views/Basic/home/settled.vue
@@ -144,65 +144,65 @@
diff --git a/src/views/Layout/index.vue b/src/views/Layout/index.vue
index 37e12d6..983fc55 100644
--- a/src/views/Layout/index.vue
+++ b/src/views/Layout/index.vue
@@ -37,15 +37,15 @@