diff --git a/public/favicon.ico b/public/favicon.ico index 4fad8fe..649bc8d 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index 16a4975..4fbb401 100644 --- a/public/index.html +++ b/public/index.html @@ -6,7 +6,7 @@ - 趣匣后台管理系统 + 大唐后台管理系统 diff --git a/rest/http-client.env.json b/rest/http-client.env.json new file mode 100644 index 0000000..34ce0f9 --- /dev/null +++ b/rest/http-client.env.json @@ -0,0 +1,15 @@ +{ + "$shared": { + "version": "v1", + "identifier": "wally", + "credential": "111111" + }, + "dev": { + "name": "dev", + "url": "http://192.168.0.99/gateway" + }, + "local": { + "version": "v2", + "url": "http://192.168.0.99/gateway" + } +} diff --git a/rest/大唐.http b/rest/大唐.http new file mode 100644 index 0000000..09cda08 --- /dev/null +++ b/rest/大唐.http @@ -0,0 +1,79 @@ +@dev = http://127.0.0.1:7270/v1.0/ +@test = https://test.tall.wiki/datang/v1.0/ +@www = http://www.tall.wiki/gateway/yanyuan/v2.0/ +@type = content-type: application/json;charset=utf-8 + +###网站轮播图查询 +POST {{test}}/carousel/query +{{type}} + +{ + "param":{ + "showPage":"0000" + } +} + +###列表查询 +GET {{test}}/content/list?showPage=0201&showPage=0210&year=&showType=1&pageNum=1&pageSize=5 + +###详情查询 +GET {{test}}/content/detail?introId=&showPage=0101 + +### 查询条件 +GET {{test}}/content/condition?showPage=0101 +### 查询常量 +GET {{test}}/constant/get?code=otherLink + + +-- 后台接口 + +### 登录 928bfd2577490322a6e19b793691467e +# @name login +POST {{test}}/back/home/login HTTP/1.1 +{{type}} + +{ + "userName":"admin", + "password": "123456" +} + +### 查询菜单 +POST {{test}}back/home/menus HTTP/1.1 +{{type}} +Authorization: {{login.response.body.$.data.token}} + +{ + +} + + +### 添加用户 +POST {{test}}/admin/add HTTP/1.1 +Authorization: {{login.response.body.$.data.token}} +{{type}} + +{ + "avatarUrl":"https://img2.baidu.com/it/u=1111829880,955526888&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500", + "userName":"admin", + "password": "123456", + "realName":"张三", + "phone":"15500000000" +} +### 添加用户 +POST {{test}}/back/contentIntro/list HTTP/1.1 +{{type}} + +{ + +} + +### 查询轮播图列表 +POST {{test}}/back/carousel/queryCarousel HTTP/1.1 +Authorization: {{login.response.body.$.data.token}} +{{type}} + +{ + "pageNum": 1, + "pageSize":10, + "showPage":"" +} diff --git a/src/api/carousel.js b/src/api/carousel.js new file mode 100644 index 0000000..60d4e8a --- /dev/null +++ b/src/api/carousel.js @@ -0,0 +1,178 @@ +import request from '@/utils/request' +const carousel = '/back/carousel' + +/** + * 查询轮播图列表 + * @param params + * @returns {Promise} + * @constructor + */ +export function POST_QUERY_CAROUSEL(params) { + return request({ + url: `${carousel}/queryCarousel`, + method: 'post', + data:params + }).then(res => res.data.data) +} + +/** + * 删除轮播图 + * @param params + * @returns {Promise} + * @constructor + */ +export function POST_DELETE_CAROUSEL(params) { + return request({ + url: `${carousel}/deleteCarousel`, + method: 'post', + data:params + }).then(res => res.data.data) +} + +/** + * 设备分润 -- 分润详情 + * @param params + * @returns {Promise} + * @constructor + */ +export function DETAIL_EQUIPMENT_LIST(params) { + return request({ + url: "/api/admin/deviceRoyalties/detail", + method: 'get', + params + }).then(res => res.data.data) +} + +/** + * 设备分润 -- 分润总数 + * @param params + * @returns {Promise} + * @constructor + */ +export function COUNT_EQUIPMENT_LIST(params) { + return request({ + url: "/api/admin/deviceRoyalties/count", + method: 'get', + params + }).then(res => res.data.data) +} + + +/** + * 设备分润 -- 生效 + * @param params + * @returns {Promise} + * @constructor + */ +export function ENABLE_EQUIPMENT_LIST(params) { + return request({ + url: "/api/admin/deviceRoyalties/enable", + method: 'post', + params + }).then(res => res.data.data) +} + + +/** + * 设备分润 -- 失效 + * @param params + * @returns {Promise} + * @constructor + */ +export function DISABLE_EQUIPMENT_LIST(params) { + return request({ + url: "/api/admin/deviceRoyalties/disable", + method: 'post', + params + }).then(res => res.data.data) +} + + + + + +/** + * 场地分润 -- 列表 + * @param params + * @returns {Promise} + * @constructor + */ +export function GET_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties", + method: 'get', + params + }).then(res => res.data.data) +} + +/** + * 场地分润 -- 保存分润 + * @param params + * @returns {Promise} + * @constructor + */ +export function POST_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties", + method: 'post', + data:params + }).then(res => res.data.data) +} + +/** + * 场地分润 -- 分润总数 + * @param params + * @returns {Promise} + * @constructor + */ +export function COUNT_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties/count", + method: 'get', + params + }).then(res => res.data.data) +} + +/** + * 场地分润 -- 分润详情 + * @param params + * @returns {Promise} + * @constructor + */ +export function DETAIL_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties/detail", + method: 'get', + params + }).then(res => res.data.data) +} + + +/** + * 场地分润 -- 生效 + * @param params + * @returns {Promise} + * @constructor + */ +export function ENABLE_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties/enable", + method: 'get', + params + }).then(res => res.data.data) +} + + +/** + * 场地分润 -- 失效 + * @param params + * @returns {Promise} + * @constructor + */ +export function DISABLE_FIELD_LIST(params) { + return request({ + url: "/api/admin/locationRoyalties/disable", + method: 'get', + params + }).then(res => res.data.data) +} diff --git a/src/api/login.js b/src/api/login.js index 2523862..49a229d 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -3,20 +3,19 @@ import { BASE_API } from '../config'; import qs from 'qs'; import { client_id, client_secret } from '@/config.js' export function loginByUsername(username, password) { - //https://www.zhangxinxu.com/wordpress/2018/08/js-base64-atob-btoa-encode-decode/ let Authorization = window.btoa(`${client_id}:${client_secret}`); const data = { - username, + userName: username, password, // "grant_type": 'merchant_password' } return axios({ url: BASE_API + '/back/home/login', method: 'POST', - data: qs.stringify(data), + data: qs.parse(data), headers: { - 'Authorization': `Basic ${Authorization}`, - 'content-type': 'application/x-www-form-urlencoded' + 'Authorization': `${Authorization}`, + 'content-type': 'application/json;charset=UTF-8' }, }) } diff --git a/src/assets/quxia.png b/src/assets/quxia.png index 3caf1cc..649bc8d 100644 Binary files a/src/assets/quxia.png and b/src/assets/quxia.png differ diff --git a/src/components/Banner/detailsOfDistribution.vue b/src/components/Banner/detailsOfDistribution.vue new file mode 100644 index 0000000..a99e610 --- /dev/null +++ b/src/components/Banner/detailsOfDistribution.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/components/Banner/form.vue b/src/components/Banner/form.vue new file mode 100644 index 0000000..d23cba9 --- /dev/null +++ b/src/components/Banner/form.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/components/Banner/index.vue b/src/components/Banner/index.vue new file mode 100644 index 0000000..7bad458 --- /dev/null +++ b/src/components/Banner/index.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/src/components/Detail/detailsOfDistribution.vue b/src/components/Detail/detailsOfDistribution.vue new file mode 100644 index 0000000..a99e610 --- /dev/null +++ b/src/components/Detail/detailsOfDistribution.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/components/Detail/form.vue b/src/components/Detail/form.vue new file mode 100644 index 0000000..d23cba9 --- /dev/null +++ b/src/components/Detail/form.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/components/Detail/index.vue b/src/components/Detail/index.vue new file mode 100644 index 0000000..7946a61 --- /dev/null +++ b/src/components/Detail/index.vue @@ -0,0 +1,268 @@ + + + + + diff --git a/src/filters/code.js b/src/filters/code.js new file mode 100644 index 0000000..28bb03b --- /dev/null +++ b/src/filters/code.js @@ -0,0 +1,292 @@ +export const tabList = [ + { + title: '首页', + code: '0000', + }, + // 公司概况 + { + title: '公司简介', + code: '0101', + }, + { + title: '公司领导', + code: '0102', + }, + { + title: '组织架构', + code: '0103', + }, + { + title: '企业VI', + code: '0104', + }, + { + title: '联系方式', + code: '0105', + }, + // 新闻中心 + { + title: '集团新闻', + code: '0201', + }, + { + title: '省公司新闻', + code: '0202', + }, + { + title: '公司新闻', + code: '0203', + }, + { + title: '图片新闻', + code: '0204', + }, + { + title: '热点专题', + code: '0205', + }, + { + title: '媒体关注', + code: '0206', + }, + { + title: '视频新闻', + code: '0207', + }, + { + title: '专题片', + code: '0208', + }, + { + title: '企业画册', + code: '0209', + }, + { + title: '现场风采', + code: '0210', + }, + // 党的建设 + { + title: '中心组学习', + code: '0301', + }, + { + title: '示范党委', + code: '0302', + }, + { + title: '党支部达标', + code: '0303', + }, + { + title: '群团工作', + code: '0304', + }, + { + title: '党建动态', + code: '0305', + }, + { + title: '党风廉政', + code: '0306', + }, + // 安全生产 + { + title: '安全会议', + code: '0401', + }, + { + title: '安全生产记录', + code: '0402', + }, + { + title: '应急管理', + code: '0403', + }, + { + title: '三讲一落实', + code: '0404', + }, + { + title: '曝光台', + code: '0405', + }, + // 通知公告 + { + title: '通知', + code: '0501', + }, + { + title: '通报', + code: '0502', + }, + { + title: '公告', + code: '0503', + }, + { + title: '值班安排', + code: '0504', + }, + { + title: '浮窗', + code: '0505', + }, + // 信息公开 + { + title: '基本信息', + code: '0601', + }, + { + title: '经营管理', + code: '0602', + }, + { + title: '公司公告', + code: '0603', + }, + { + title: '社会责任', + code: '0604', + }, + { + title: '关于信息公开', + code: '0605', + }, + // 审批事项 + { + title: '公务用车', + code: '', + }, + { + title: '领导干部外出报备', + code: '', + }, + { + title: '疫情防控', + code: '', + }, + { + title: '用印申请', + code: '', + }, + { + title: '业务招待事项', + code: '', + }, + { + title: '会议室使用', + code: '', + }, + { + title: '办公用品领用', + code: '', + }, + // 制度资料 + { + title: '集团公司制度', + code: '0801', + }, + { + title: '山西公司制度', + code: '0802', + }, + { + title: '行业标准与制度', + code: '0803', + }, + { + title: '公司制度', + code: '0804', + }, + { + title: '地方规章', + code: '0805', + }, + { + title: '培训课件', + code: '0806', + }, + { + title: '培训影像', + code: '0807', + }, + { + title: '科技创新', + code: '0808', + }, + // 部门首页 + { + title: '总经理工作部', + code: '0901', + }, + { + title: '计划营销部', + code: '0902', + }, + { + title: '财务管理部', + code: '0903', + }, + { + title: '人力资源部', + code: '0904', + }, + { + title: '党群工作部', + code: '0905', + }, + { + title: '纪委办公室（审计部）', + code: '0906', + }, + { + title: '燃料采购部', + code: '0907', + }, + { + title: '物资管理部', + code: '0908', + }, + { + title: '项目开发部', + code: '0909', + }, + { + title: '燃料质量验收部', + code: '0910', + }, + { + title: '安全监督部', + code: '0911', + }, + { + title: '设备部', + code: '0912', + }, + { + title: '发电部', + code: '0913', + }, + { + title: '维护部', + code: '0914', + }, + { + title: '热工专业', + code: '0915', + }, + { + title: '电气专业', + code: '0916', + }, + // 其他 + { + title: '光荣榜', + code: '9902', + }, + { + title: '今天我出境', + code: '9903', + }, + ] diff --git a/src/permission.js b/src/permission.js index af7ebb3..d996c0a 100644 --- a/src/permission.js +++ b/src/permission.js @@ -20,13 +20,9 @@ router.beforeEach((to, from, next) => { } else { next('/login') } - } - - - }) router.afterEach(() => { NProgress.done() // finish progress bar -}) \ No newline at end of file +}) diff --git a/src/router/index.js b/src/router/index.js index f0da2bd..f1d90b6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,7 +35,8 @@ export const constantRoutes = [ require("./menus/approval.js").default, require("./menus/system.js").default, require("./menus/department.js").default, - { path: '*', redirect: '/404', hidden: true } + require("./menus/others.js").default, + { path: '*', redirect: '/404', hidden: true }, // { // path: '/dashboard', // component: Layout, diff --git a/src/router/menus/approval.js b/src/router/menus/approval.js index 3fa7281..6af8039 100644 --- a/src/router/menus/approval.js +++ b/src/router/menus/approval.js @@ -1,6 +1,6 @@ import Layout from '@/views/layout/Layout' -const commodityManagement = { +const approval = { path: '/approval', component: Layout, meta: {title: '审批事项', icon: 'dingdan', noCache: true, affix: false}, @@ -57,4 +57,4 @@ const commodityManagement = { ] }; -export default commodityManagement +export default approval diff --git a/src/router/menus/building.js b/src/router/menus/building.js index 18bebe0..9eaf41c 100644 --- a/src/router/menus/building.js +++ b/src/router/menus/building.js @@ -1,6 +1,6 @@ import Layout from '@/views/layout/Layout' -const commodityManagement = { +const building = { path: '/building', component: Layout, meta: {title: '党的建设', icon: 'dingdan', noCache: true, affix: false}, @@ -50,4 +50,4 @@ const commodityManagement = { ] }; -export default commodityManagement +export default building diff --git a/src/router/menus/department.js b/src/router/menus/department.js index 5721c8c..778c5ae 100644 --- a/src/router/menus/department.js +++ b/src/router/menus/department.js @@ -1,6 +1,6 @@ import Layout from '@/views/layout/Layout' -const commodityManagement = { +const department = { path: '/department', component: Layout, meta: {title: '部门首页', icon: 'dingdan', noCache: true, affix: false}, @@ -120,4 +120,4 @@ const commodityManagement = { ] }; -export default commodityManagement +export default department diff --git a/src/router/menus/others.js b/src/router/menus/others.js new file mode 100644 index 0000000..d01bd38 --- /dev/null +++ b/src/router/menus/others.js @@ -0,0 +1,25 @@ +import Layout from '@/views/layout/Layout' + +const others = { + path: '/others', + component: Layout, + meta: {title: '其他', icon: 'dingdan', noCache: true, affix: false}, + children: [ + { + path: '/others1', + code: '9902', + component: () => import('@/views/lists/index'), + name: '光荣榜', + meta: {title: '光荣榜', noCache: false, affix: false} + }, + { + path: '/others2', + code: '9903', + component: () => import('@/views/lists/index'), + name: '今天我出境', + meta: {title: '今天我出境', noCache: false, affix: false}, + }, + ] +}; + +export default others diff --git a/src/store/modules/user.js b/src/store/modules/user.js index a61e91d..d4bd822 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -51,11 +51,11 @@ const user = { loginByUsername(username, userInfo.password).then(response => { if (!response.data) { reject(response.code); return false } const data = response.data - if (data.access_token) { - commit('SET_TOKEN', data.access_token) - setToken(response.data.access_token) + if (data.data.token) { + commit('SET_TOKEN', data.data.token) + setToken(response.data.data.token) } - resolve(response.data.access_token) + resolve(response.data.data) }).catch(error => { reject(error) }) diff --git a/src/styles/index.scss b/src/styles/index.scss index 06c710b..4f21b26 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -65,6 +65,26 @@ div:focus { float: left; } +.pa-1 { + padding: 4px; +} + +.pa-2 { + padding: 8px; +} + +.pa-3 { + padding: 12px; +} + +.pa-4 { + padding: 16px; +} + +.pa-5 { + padding: 20px; +} + .pr-5 { padding-right: 5px; } @@ -134,6 +154,10 @@ code { padding: 20px; } +.white { + background: #fff; +} + .components-container { margin: 30px 50px; position: relative; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 0344970..bc3b645 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -59,15 +59,23 @@ } // menu hover + .is-active>.el-submenu__title { + font-weight: bold; + color: $subMenuActiveText !important; + } + .submenu-title-noDropdown, .el-submenu__title { &:hover { background-color: $menuHover !important; + color: $menuHoverText !important; } } - .is-active>.el-submenu__title { - color: $subMenuActiveText !important; + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item.is-active { + color: $subMenuBgActiveText !important; + background-color: $subMenuBgActiveBg !important; } & .nest-menu .el-submenu>.el-submenu__title, @@ -77,8 +85,11 @@ &:hover { background-color: $subMenuHover !important; + color: $subMenuBgActiveText !important; } } + + } .hideSidebar { diff --git a/src/styles/variables.scss b/src/styles/variables.scss index f415670..40a410e 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -7,21 +7,26 @@ $green: #30B08F; $tiffany: #4AB7BD; $yellow:#FEC171; $panGreen: #30B08F; +$gray: #aaa; //sidebar -$menuText:#bfcbd9; -$menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 +$menuText:#333; +$menuActiveText:#a90500; +$subMenuActiveText:#a90500; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; -$menuHover:#263445; +$menuBg:#fff; +$menuHover:#b54343; +$menuHoverText:#fff; -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#fff; +$subMenuHover:#b54343; $pageBg:#f4f4f5; $sideBarWidth: 210px; +$subMenuBgActiveText: #fff; +$subMenuBgActiveBg: #870400; + // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass :export { @@ -30,7 +35,10 @@ $sideBarWidth: 210px; subMenuActiveText: $subMenuActiveText; menuBg: $menuBg; menuHover: $menuHover; + menuHoverText: $menuHoverText; subMenuBg: $subMenuBg; subMenuHover: $subMenuHover; sideBarWidth: $sideBarWidth; + subMenuBgActiveBg: $subMenuBgActiveBg; + subMenuBgActiveText: $subMenuBgActiveText; } diff --git a/src/utils/request.js b/src/utils/request.js index 7ce4c0c..4a87d02 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ service.interceptors.request.use( config => { // Do something before request is sent if (getCookie('access_token')) { - config.headers['Authorization'] = `Bearer ${getCookie('access_token')}` + config.headers['Authorization'] = `${getCookie('access_token')}` } //如果参数value是空，就不需要传给后台 diff --git a/src/views/advertisingManagement/advertisingPlan/index.vue b/src/views/advertisingManagement/advertisingPlan/index.vue index 701e3a2..65cd458 100644 --- a/src/views/advertisingManagement/advertisingPlan/index.vue +++ b/src/views/advertisingManagement/advertisingPlan/index.vue @@ -248,7 +248,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/commodityManagement/commodityClassification/classification.vue b/src/views/commodityManagement/commodityClassification/classification.vue index 12b2232..23a9dcd 100644 --- a/src/views/commodityManagement/commodityClassification/classification.vue +++ b/src/views/commodityManagement/commodityClassification/classification.vue @@ -297,7 +297,7 @@ padding: 20px; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; margin-right: 10px; } diff --git a/src/views/commodityManagement/commodityClassification/classificationList.vue b/src/views/commodityManagement/commodityClassification/classificationList.vue index 26c0613..ab90f9f 100644 --- a/src/views/commodityManagement/commodityClassification/classificationList.vue +++ b/src/views/commodityManagement/commodityClassification/classificationList.vue @@ -212,7 +212,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/commodityManagement/commodityClassification1/classificationList.vue b/src/views/commodityManagement/commodityClassification1/classificationList.vue index 984ebf2..4de48f5 100644 --- a/src/views/commodityManagement/commodityClassification1/classificationList.vue +++ b/src/views/commodityManagement/commodityClassification1/classificationList.vue @@ -208,7 +208,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/commodityManagement/productList/index.vue b/src/views/commodityManagement/productList/index.vue index 24e0dd4..75faedf 100644 --- a/src/views/commodityManagement/productList/index.vue +++ b/src/views/commodityManagement/productList/index.vue @@ -271,7 +271,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/device/group/addDeviceModal.vue b/src/views/device/group/addDeviceModal.vue index 47258d2..446bec7 100644 --- a/src/views/device/group/addDeviceModal.vue +++ b/src/views/device/group/addDeviceModal.vue @@ -27,14 +27,14 @@ icon-class="right" class="icon left" @click="toRight" - :style="{background:clickType=='clickleft'?'#409EFF':'#bfcbd9', + :style="{background:clickType=='clickleft'?'#a90500':'#bfcbd9', cursor:clickType=='clickleft'?'pointer':'not-allowed' }" /> diff --git a/src/views/device/group/index.vue b/src/views/device/group/index.vue index a0d4056..aa2cae9 100644 --- a/src/views/device/group/index.vue +++ b/src/views/device/group/index.vue @@ -29,13 +29,13 @@ 编辑 添加设备 删除 @@ -324,4 +324,4 @@ export default { margin-top: 10px; padding-bottom: 10px; } - \ No newline at end of file + diff --git a/src/views/device/list/index.vue b/src/views/device/list/index.vue index 5000e88..2659b04 100644 --- a/src/views/device/list/index.vue +++ b/src/views/device/list/index.vue @@ -38,7 +38,7 @@ 编辑 二维码 diff --git a/src/views/distribution/equipment/index.vue b/src/views/distribution/equipment/index.vue index 2ef9233..fe8a5f1 100644 --- a/src/views/distribution/equipment/index.vue +++ b/src/views/distribution/equipment/index.vue @@ -263,7 +263,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/distribution/field/index.vue b/src/views/distribution/field/index.vue index 8a37d1f..cd72702 100644 --- a/src/views/distribution/field/index.vue +++ b/src/views/distribution/field/index.vue @@ -258,7 +258,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 7060392..39bf693 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -1,269 +1,40 @@ diff --git a/src/views/inventory/detail/table1.vue b/src/views/inventory/detail/table1.vue index 8b1164c..758f8fa 100644 --- a/src/views/inventory/detail/table1.vue +++ b/src/views/inventory/detail/table1.vue @@ -125,5 +125,3 @@ export default { background: #fff; } - - diff --git a/src/views/inventory/list/index.vue b/src/views/inventory/list/index.vue index f59c852..716bc07 100644 --- a/src/views/inventory/list/index.vue +++ b/src/views/inventory/list/index.vue @@ -113,9 +113,7 @@ export default { } } .option-span { - color: #409eff; + color: #a90500; cursor: pointer; } - - diff --git a/src/views/lists/index.vue b/src/views/lists/index.vue index 7060392..47c67f1 100644 --- a/src/views/lists/index.vue +++ b/src/views/lists/index.vue @@ -258,7 +258,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/location/AddDevice2location.vue b/src/views/location/AddDevice2location.vue index 7200ee0..d7985dc 100644 --- a/src/views/location/AddDevice2location.vue +++ b/src/views/location/AddDevice2location.vue @@ -125,14 +125,14 @@ export default { leftStyle() { return { color: "#fff", - background: this.isClickLeft ? "#409EFF" : "#bfcbd9", + background: this.isClickLeft ? "#a90500" : "#bfcbd9", cursor: this.isClickLeft ? "pointer" : "not-allowed" }; }, rightStyle() { return { color: "#fff", - background: this.isClickRight ? "#409EFF" : "#bfcbd9", + background: this.isClickRight ? "#a90500" : "#bfcbd9", cursor: this.isClickRight ? "pointer" : "not-allowed" }; }, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5553a5c..d23e20a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -9,7 +9,7 @@ label-position="left" >
-

趣匣后台管理系统

+

大唐后台管理系统

@@ -117,16 +117,17 @@ export default { this.passwordType = "password"; } }, + // 登录 handleLogin() { this.$refs.loginForm.validate(valid => { if (valid) { this.loading = true; this.$store .dispatch("LoginByUsername", this.loginForm) - .then(access_token => { + .then(res => { this.loading = false; - if (access_token) { - setCookie("access_token", access_token); + if (res.token) { + setCookie("access_token", res.token); this.$store.state.user.user = this.loginForm.username; setCookie("LoginByUsername", JSON.stringify(this.loginForm)); this.$router.push({ diff --git a/src/views/marketingCenter/couponManagement/index.vue b/src/views/marketingCenter/couponManagement/index.vue index 63b1dc4..ea63ff9 100644 --- a/src/views/marketingCenter/couponManagement/index.vue +++ b/src/views/marketingCenter/couponManagement/index.vue @@ -472,7 +472,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/luckyDraw/index.vue b/src/views/marketingCenter/luckyDraw/index.vue index 2e58109..aaef8ff 100644 --- a/src/views/marketingCenter/luckyDraw/index.vue +++ b/src/views/marketingCenter/luckyDraw/index.vue @@ -262,7 +262,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/luckyDraw/luckyDrawDetails.vue b/src/views/marketingCenter/luckyDraw/luckyDrawDetails.vue index c5193a2..db47b31 100644 --- a/src/views/marketingCenter/luckyDraw/luckyDrawDetails.vue +++ b/src/views/marketingCenter/luckyDraw/luckyDrawDetails.vue @@ -461,7 +461,7 @@ } .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } diff --git a/src/views/marketingCenter/luckyFree/index.vue b/src/views/marketingCenter/luckyFree/index.vue index c59a55c..8a967d8 100644 --- a/src/views/marketingCenter/luckyFree/index.vue +++ b/src/views/marketingCenter/luckyFree/index.vue @@ -262,7 +262,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/noviceCourtesy/index.vue b/src/views/marketingCenter/noviceCourtesy/index.vue index 852dbc6..01c49fc 100644 --- a/src/views/marketingCenter/noviceCourtesy/index.vue +++ b/src/views/marketingCenter/noviceCourtesy/index.vue @@ -325,7 +325,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/paymentOfCourtesy/index.vue b/src/views/marketingCenter/paymentOfCourtesy/index.vue index cf1a03b..7fb2595 100644 --- a/src/views/marketingCenter/paymentOfCourtesy/index.vue +++ b/src/views/marketingCenter/paymentOfCourtesy/index.vue @@ -261,7 +261,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/marketingCenter/salesPromotion/index.vue b/src/views/marketingCenter/salesPromotion/index.vue index a4b22ce..06e1da5 100644 --- a/src/views/marketingCenter/salesPromotion/index.vue +++ b/src/views/marketingCenter/salesPromotion/index.vue @@ -321,7 +321,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/order/luckyFree/index.vue b/src/views/order/luckyFree/index.vue index 1830c59..fe0e878 100644 --- a/src/views/order/luckyFree/index.vue +++ b/src/views/order/luckyFree/index.vue @@ -158,7 +158,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/order/salesOrder/index.vue b/src/views/order/salesOrder/index.vue index 61df85c..e4c8c9c 100644 --- a/src/views/order/salesOrder/index.vue +++ b/src/views/order/salesOrder/index.vue @@ -191,7 +191,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/orgManage/orgManage/index.vue b/src/views/orgManage/orgManage/index.vue index 08d34e8..4cb0975 100644 --- a/src/views/orgManage/orgManage/index.vue +++ b/src/views/orgManage/orgManage/index.vue @@ -413,7 +413,7 @@ padding: 0 20px 0 20px; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/privilegeManagement/account/index.vue b/src/views/privilegeManagement/account/index.vue index 743ef4b..4288a3b 100644 --- a/src/views/privilegeManagement/account/index.vue +++ b/src/views/privilegeManagement/account/index.vue @@ -365,7 +365,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/privilegeManagement/role/index.vue b/src/views/privilegeManagement/role/index.vue index e316ba9..7dcb481 100644 --- a/src/views/privilegeManagement/role/index.vue +++ b/src/views/privilegeManagement/role/index.vue @@ -189,7 +189,7 @@ height: 100%; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } @@ -203,7 +203,7 @@ border-right: 1px solid #d9d9d9; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/privilegeManagement/role/permissions.vue b/src/views/privilegeManagement/role/permissions.vue index 2f83ba6..fba71e1 100644 --- a/src/views/privilegeManagement/role/permissions.vue +++ b/src/views/privilegeManagement/role/permissions.vue @@ -395,7 +395,7 @@ border-right: 1px solid #d9d9d9; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/richText/index.vue b/src/views/richText/index.vue index 7060392..47c67f1 100644 --- a/src/views/richText/index.vue +++ b/src/views/richText/index.vue @@ -258,7 +258,7 @@ background: #fff; .option-span { - color: #409EFF; + color: #a90500; cursor: pointer; } } diff --git a/src/views/shelfs/list/putawayShelf/centerBtns.vue b/src/views/shelfs/list/putawayShelf/centerBtns.vue index 7599751..4fbfb28 100644 --- a/src/views/shelfs/list/putawayShelf/centerBtns.vue +++ b/src/views/shelfs/list/putawayShelf/centerBtns.vue @@ -34,14 +34,14 @@ export default { leftStyle() { return { color: "#fff", - background: this.isClickLeft ? "#409EFF" : "#bfcbd9", + background: this.isClickLeft ? "#a90500" : "#bfcbd9", cursor: this.isClickLeft ? "pointer" : "not-allowed" }; }, rightStyle() { return { color: "#fff", - background: this.isClickRight ? "#409EFF" : "#bfcbd9", + background: this.isClickRight ? "#a90500" : "#bfcbd9", cursor: this.isClickRight ? "pointer" : "not-allowed" }; }, @@ -80,4 +80,3 @@ export default { } } - diff --git a/src/views/shelfs/list/table.vue b/src/views/shelfs/list/table.vue index 7a6d503..d124ade 100644 --- a/src/views/shelfs/list/table.vue +++ b/src/views/shelfs/list/table.vue @@ -14,7 +14,7 @@ @@ -31,13 +31,13 @@ 上架 删除 @@ -140,4 +140,3 @@ export default { } }; - diff --git a/src/views/shelfs/replenishment/quxia.vue b/src/views/shelfs/replenishment/quxia.vue index 7dc4624..afb5e1e 100644 --- a/src/views/shelfs/replenishment/quxia.vue +++ b/src/views/shelfs/replenishment/quxia.vue @@ -48,7 +48,7 @@ diff --git a/src/views/shelfs/status/table.vue b/src/views/shelfs/status/table.vue index dac1521..ebfc011 100644 --- a/src/views/shelfs/status/table.vue +++ b/src/views/shelfs/status/table.vue @@ -33,7 +33,7 @@ @@ -152,4 +152,3 @@ header { } } - diff --git a/src/views/valueAddedManagement/valueAddedAtatistics/index.vue b/src/views/valueAddedManagement/valueAddedAtatistics/index.vue index be86054..dc25255 100644 --- a/src/views/valueAddedManagement/valueAddedAtatistics/index.vue +++ b/src/views/valueAddedManagement/valueAddedAtatistics/index.vue @@ -88,7 +88,7 @@ @@ -278,7 +278,7 @@ } .active { - border-bottom: 2px solid #409EFF; + border-bottom: 2px solid #a90500; } } diff --git a/vue.config.js b/vue.config.js index 6927552..628093c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,22 +1,26 @@ // vue.config.js -var path = require("path") +var path = require("path"); + +const BASE_API = "https://test.tall.wiki/datang/v1.0" +const proxyUrl = '/datang/v1.0' const port = 8080 module.exports = { - // devServer: { - // port, - // proxy: { - // change xxx-api/login => mock/login - // detail: https://cli.vuejs.org/config/#devserver-proxy - // ['/api']: { - // target: `http://localhost:${port}/mock`, - // changeOrigin: true, - // ['^' + "/api"]: '' - // pathRewrite: { - // } - // } - // }, + devServer: { + open: true, + overlay: { + warnings: false, + errors: true, + }, + proxy: { + [proxyUrl]: { + target: BASE_API, // 代理接口 + changeOrigin: true, + pathRewrite: { [`^${proxyUrl}`]: '' }, + }, + }, + }, // after(app) { // const baseConfig = require('./babel.config') // require('babel-register')({ @@ -38,16 +42,16 @@ module.exports = { // } // }, chainWebpack: config => { - //配置 alias + //配置 alias config.resolve.alias.set("~", path.resolve(__dirname, './public')) - //处理 前端资源的image 都转base64 file-loader + //处理 前端资源的image 都转base64 file-loader config.module .rule('images') .use('url-loader') .loader('url-loader') .tap(options => Object.assign(options, { limit: 10240 })) - // html plugin + // html plugin config.plugin('html') .tap(args => { args[0].minify = { @@ -56,4 +60,4 @@ module.exports = { return args }) } -} \ No newline at end of file +}