diff --git a/backend/package-lock.json b/backend/package-lock.json index 1adf707..be6d88c 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -18,6 +18,7 @@ "nprogress": "0.2.0", "path-to-regexp": "2.4.0", "sortablejs": "^1.14.0", + "tinymce": "^5.10.3", "vue": "2.6.10", "vue-router": "3.0.6", "vuedraggable": "^2.24.3", @@ -2304,6 +2305,14 @@ "integrity": "sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==", "dev": true }, + "node_modules/@tinymce/tinymce-vue": { + "version": "3.2.8", + "resolved": "https://registry.npmmirror.com/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz", + "integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA==", + "peerDependencies": { + "vue": "^2.4.3" + } + }, "node_modules/@types/babel__core": { "version": "7.1.18", "resolved": "https://registry.npmmirror.com/@types/babel__core/-/babel__core-7.1.18.tgz", @@ -17792,6 +17801,11 @@ "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==", "dev": true }, + "node_modules/tinymce": { + "version": "5.10.3", + "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-5.10.3.tgz", + "integrity": "sha512-O59ssHNnujWvSk5Gt8hIGrdNCMKVWVQv9F8siAgLTRgTh0t3NDHrP1UlLtCxArUi9DPWZvlBeUz8D5fJTu7vnA==" + }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.0.33.tgz", @@ -21585,6 +21599,12 @@ "integrity": "sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==", "dev": true }, + "@tinymce/tinymce-vue": { + "version": "3.2.8", + "resolved": "https://registry.npmmirror.com/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz", + "integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA==", + "requires": {} + }, "@types/babel__core": { "version": "7.1.18", "resolved": "https://registry.npmmirror.com/@types/babel__core/-/babel__core-7.1.18.tgz", @@ -34466,6 +34486,11 @@ "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==", "dev": true }, + "tinymce": { + "version": "5.10.3", + "resolved": "https://registry.npmmirror.com/tinymce/-/tinymce-5.10.3.tgz", + "integrity": "sha512-O59ssHNnujWvSk5Gt8hIGrdNCMKVWVQv9F8siAgLTRgTh0t3NDHrP1UlLtCxArUi9DPWZvlBeUz8D5fJTu7vnA==" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.0.33.tgz", diff --git a/backend/package.json b/backend/package.json index db5318b..633feaf 100644 --- a/backend/package.json +++ b/backend/package.json @@ -23,6 +23,7 @@ "nprogress": "0.2.0", "path-to-regexp": "2.4.0", "sortablejs": "^1.14.0", + "tinymce": "^5.10.3", "vue": "2.6.10", "vue-router": "3.0.6", "vuedraggable": "^2.24.3", diff --git a/backend/public/._favicon.ico b/backend/public/._favicon.ico new file mode 100644 index 0000000..28194af Binary files /dev/null and b/backend/public/._favicon.ico differ diff --git a/backend/public/._login.jpg b/backend/public/._login.jpg new file mode 100644 index 0000000..7ab1443 Binary files /dev/null and b/backend/public/._login.jpg differ diff --git a/backend/src/api/courseCat.js b/backend/src/api/courseCat.js new file mode 100644 index 0000000..8c6950e --- /dev/null +++ b/backend/src/api/courseCat.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' +let baseUrl = '/pc/course/cat/' +export function getList() { + return request({ + url: baseUrl+'list', + method: 'get' + }) +} +export function add(cat) { + return request({ + url: baseUrl+"add", + method: 'post', + data: cat + }) +} + +export function update(cat) { + return request({ + url: baseUrl+"update", + method: 'post', + data: cat + }) +} + +export function del(cat) { + return request({ + url: baseUrl+"delete", + method: 'post', + data: cat + }) +} \ No newline at end of file diff --git a/backend/src/api/courseTag.js b/backend/src/api/courseTag.js new file mode 100644 index 0000000..e114e45 --- /dev/null +++ b/backend/src/api/courseTag.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' +let baseUrl = '/pc/course/tag/' +export function getList() { + return request({ + url: baseUrl+'list', + method: 'get' + }) +} +export function add(cat) { + return request({ + url: baseUrl+"add", + method: 'post', + data: cat + }) +} + +export function update(cat) { + return request({ + url: baseUrl+"update", + method: 'post', + data: cat + }) +} + +export function del(cat) { + return request({ + url: baseUrl+"delete", + method: 'post', + data: cat + }) +} \ No newline at end of file diff --git a/backend/src/api/user.js b/backend/src/api/user.js index 4f00591..5ffe1b5 100644 --- a/backend/src/api/user.js +++ b/backend/src/api/user.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function login(data) { return request({ - url: '/api/user/login', + url: '/api/user/login/password', method: 'post', data }) @@ -10,14 +10,15 @@ export function login(data) { export function getInfo(token) { return request({ - url: '/api/user/info', - method: 'get' + url: '/auth/user/info', + method: 'post', + data: {} }) } export function logout() { return request({ - url: '/api/user/logout', + url: '/auth/user/logout', method: 'post' }) } diff --git a/backend/src/components/Breadcrumb/index.vue b/backend/src/components/Breadcrumb/index.vue index 29f9a04..e65a60d 100644 --- a/backend/src/components/Breadcrumb/index.vue +++ b/backend/src/components/Breadcrumb/index.vue @@ -33,7 +33,7 @@ export default { const first = matched[0] if (!this.isDashboard(first)) { - matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched) + matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched) } this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) diff --git a/backend/src/components/Upload/SingleImage.vue b/backend/src/components/Upload/SingleImage.vue index 5f20792..0077871 100644 --- a/backend/src/components/Upload/SingleImage.vue +++ b/backend/src/components/Upload/SingleImage.vue @@ -5,9 +5,10 @@ :multiple="false" :show-file-list="false" :on-success="handleImageSuccess" + :headers="myHeaders" class="image-uploader" drag - action="https://httpbin.org/post" + action="/api/upload/image/upload" >