diff --git a/config/dev.env.js b/config/dev.env.js index 75dfdb7b5cb555fc23f87ac5174fd0602f035796..d32eb47964f2360355ef3b36eff9c3ac67d83870 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -4,5 +4,5 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://localhost:8080"' + BASE_API: '"http://api.yilvaroma.com"' }) diff --git a/config/prod.env.js b/config/prod.env.js index cbe72b3fa19ef131f7f59f5c1f54b1e14f08d58e..e303916a708df98c459ea240faf696d7d551ad5f 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -1,5 +1,5 @@ 'use strict' module.exports = { NODE_ENV: '"production"', - BASE_API: '"https://admin-api.macrozheng.com"' + BASE_API: '"http://api.yilvaroma.com"' } diff --git a/index.html b/index.html index 9939a5694ea60aaa6244181acc7330429abb5464..ff942e66b136176ad6d545030c7a91f8a3a1b54c 100644 --- a/index.html +++ b/index.html @@ -28,5 +28,6 @@
+
闽ICP备2023009174号
diff --git a/package-lock.json b/package-lock.json index 4aef5cc09bc6f38bc62699e1afcfc68f4d8cf588..9142ba301fff054ba326d61c4f8ea5d3c71a01df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4103,10 +4103,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "~0.4.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -4183,9 +4183,9 @@ "dev": true, "optional": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -4194,7 +4194,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -4203,7 +4203,7 @@ "dev": true, "optional": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { diff --git a/src/api/cms.js b/src/api/cms.js new file mode 100644 index 0000000000000000000000000000000000000000..baaab0a75c5f3124fdcac4624161ea52695ae7fa --- /dev/null +++ b/src/api/cms.js @@ -0,0 +1,77 @@ +import request from '@/utils/request' +export function getInfo(id) { + return request({ + url:'/info/'+id, + method:'get', + }) +} + +export function getInfoCate(id) { + return request({ + url:'/info/cate/'+id, + method:'get', + }) +} + + +export function addInfoCate(data) { + return request({ + url:'/info/cate/create', + method:'post', + data:data + }) +} + +export function deleteInfoCate(id) { + return request({ + url:'/info/cate/delete/'+ id , + method:'post', + }) +} + +export function getInfoCateList(id) { + return request({ + url:'/info/cate/treeList', + }) +} + +export function updateInfoCate(data) { + return request({ + url:'/info/cate/update' , + method:'post', + data + }) +} + +export function createInfo(data) { + return request({ + url:'/info/create' , + method:'post', + data + }) +} + +export function updateInfo(data) { + return request({ + url:'/info/update' , + method:'post', + data + }) +} + +export function deleteInfo(id) { + return request({ + url:'/info/delete/' + id , + method:'post', + }) +} + +export function getInfoByPage(categoryId,keyword,pageNum,pageSize) { + return request({ + url:'/info/page', + method:'get', + params: { + categoryId,keyword,pageNum,pageSize + } + }) +} diff --git a/src/components/Upload/multiUpload.vue b/src/components/Upload/multiUpload.vue index c684a2f79efd23cc37629b0f4146b493b03271a7..dff384486983cecccac65f25a78605e0b330149d 100644 --- a/src/components/Upload/multiUpload.vue +++ b/src/components/Upload/multiUpload.vue @@ -47,7 +47,7 @@ dialogImageUrl:null, useOss:false, //使用oss->true;使用MinIO->false ossUploadUrl:'http://macro-oss.oss-cn-shenzhen.aliyuncs.com', - minioUploadUrl:'http://localhost:8080/minio/upload', + minioUploadUrl:'http://api.yilvaroma.com/minio/upload', }; }, computed: { diff --git a/src/components/Upload/singleUpload.vue b/src/components/Upload/singleUpload.vue index 7d83601782769f077cbf8225ebaadc5bf0e8b4a1..a2710d94c946799096deb9a1bbad266d82a402b2 100644 --- a/src/components/Upload/singleUpload.vue +++ b/src/components/Upload/singleUpload.vue @@ -65,7 +65,7 @@ dialogVisible: false, useOss:false, //使用oss->true;使用MinIO->false ossUploadUrl:'http://macro-oss.oss-cn-shenzhen.aliyuncs.com', - minioUploadUrl:'http://localhost:8080/minio/upload', + minioUploadUrl:'http://api.yilvaroma.com/minio/upload', }; }, methods: { diff --git a/src/icons/svg/news-category.svg b/src/icons/svg/news-category.svg new file mode 100644 index 0000000000000000000000000000000000000000..2a3dfeef7262849f0a7a5410078b715b2ced62e1 --- /dev/null +++ b/src/icons/svg/news-category.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/news-preview.svg b/src/icons/svg/news-preview.svg new file mode 100644 index 0000000000000000000000000000000000000000..40aeb0133f141fa038bc5861dbce778d97edbebd --- /dev/null +++ b/src/icons/svg/news-preview.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/news.svg b/src/icons/svg/news.svg new file mode 100644 index 0000000000000000000000000000000000000000..c73b8cb416f7d1645bd27f8ab3eb82a6bbf4618a --- /dev/null +++ b/src/icons/svg/news.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 652e4bb239457a93b54284bbc49c0cb8b4346704..6980543868795f73bba5e2d170366d477d75741d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -129,6 +129,27 @@ export const asyncRouterMap = [ } ] }, + { + path: '/zms', + component: Layout, + redirect: '/zms/category', + name: 'zms', + meta: {title: '咨讯', icon: 'news'}, + children: [ + { + path: 'category', + name: 'category', + component: () => import('@/views/zms/category'), + meta: {title: '咨讯分类', icon: 'news-category'} + }, + { + path: 'preview', + name: 'preview', + component: () => import('@/views/zms/preview'), + meta: {title: '预览管理', icon: 'news-preview'}, + }, + ] + }, { path: '/oms', component: Layout, diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index eb907db48cd9f3691dd6635e22e301d83bee43d8..830023f1a2f60e7c8244c8a0f4d4bbd5acee3964 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -80,6 +80,7 @@ const permission = { return new Promise(resolve => { const { menus } = data; const { username } = data; + console.log(menus) const accessedRouters = asyncRouterMap.filter(v => { //admin帐号直接返回所有菜单 // if(username==='admin') return true; @@ -99,6 +100,7 @@ const permission = { return false; }); //对菜单进行排序 + console.log(accessedRouters) sortRouters(accessedRouters); commit('SET_ROUTERS', accessedRouters); resolve(); diff --git a/src/views/zms/category/index.vue b/src/views/zms/category/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..878e01c0bd3131b0285691a0906a85b1d5149333 --- /dev/null +++ b/src/views/zms/category/index.vue @@ -0,0 +1,251 @@ + + + + diff --git a/src/views/zms/preview/edit.vue b/src/views/zms/preview/edit.vue new file mode 100644 index 0000000000000000000000000000000000000000..6ef3610123f0067410e36116b7de79ed0ee19a61 --- /dev/null +++ b/src/views/zms/preview/edit.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/src/views/zms/preview/index.vue b/src/views/zms/preview/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..31db6e5870067ae9f2d996cdbb67c3c7bd82c6d9 --- /dev/null +++ b/src/views/zms/preview/index.vue @@ -0,0 +1,248 @@ + + + + \ No newline at end of file