diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 6ebc6aae..9f6b95c7 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -62,7 +62,7 @@ module.exports = { loaders: ["style", "css", "sass"] }, { - test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, + test: /\.(woff2?|eot|ttf|otf|TTF)(\?.*)?$/, loader: 'url-loader', options: { limit: 10000, diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js index 99888827..682aaa42 100644 --- a/src/api/lawEnforcement/index.js +++ b/src/api/lawEnforcement/index.js @@ -42,3 +42,29 @@ export function productList(query) { params: query }) } + +//查询新闻管理列表分页 +export function newsList(query) { + return request({ + url: '/enforce/website/newsList', + method: 'get', + params: query + }) +} + +//查询新闻详情 +export function newsDetail(id) { + return request({ + url: '/enforce/website/news/'+id, + method: 'get' + }) +} + +//查询方案公开固定条数 +export function schemeList(query) { + return request({ + url: '/enforce/website/scheme/list', + method: 'get', + params: query + }) +} diff --git a/src/assets/fonts/zqkhyt.TTF b/src/assets/fonts/zqkhyt.TTF new file mode 100644 index 00000000..662e8e2f Binary files /dev/null and b/src/assets/fonts/zqkhyt.TTF differ diff --git a/src/permission.js b/src/permission.js index 41b198b9..4495d643 100644 --- a/src/permission.js +++ b/src/permission.js @@ -55,6 +55,7 @@ const whiteList = [ '/lawEnforcement/work', '/lawEnforcement/workDetail', '/lawEnforcement/caseDetail', + '/lawEnforcement/login', ] router.beforeEach((to, from, next) => { diff --git a/src/router/index.js b/src/router/index.js index 24316b10..07bcbe9e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1608,6 +1608,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/lawEnforcement/case/caseDetail'], resolve) }, + { + path: '/lawEnforcement/login', + name: 'login', + meta: { + title: '登录', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/login'], resolve) + }, ]; diff --git a/src/views/lawEnforcement/index.vue b/src/views/lawEnforcement/index.vue index 2ecfc991..d6bb8fd1 100644 --- a/src/views/lawEnforcement/index.vue +++ b/src/views/lawEnforcement/index.vue @@ -7,41 +7,30 @@ + + + +

{{item.title}}

+
+
+ - - - -

{{item.title}}

-
-
- - + +
- - - -

{{item.title}}

-
-
- - + +
- - - -

{{item.title}}

-
-
- - + +
@@ -77,7 +66,7 @@ - +