Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/manage.js

src/api/manage.js

@@ -7,7 +7,8 @@ const api = {
   bdictionary: '/bdictionary',
   banner: '/Banner',
   label: '/BLabel',
-  bLesson: '/BLesson'
+  bLesson: '/BLesson',
+  file: '/file'
 };
 
 export default api;
@@ -75,10 +76,21 @@ export function addBanner(parameter) {
     params: parameter
   });
 }
+// 新建banner上传图片
+export function uploadBannerImg(parameter) {
+  return axios({
+    url: api.file + '/upload',
+    method: 'post',
+    params: parameter,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  });
+}
 // 查询课程列表
 export function courselist(parameter) {
   return axios({
-    url: api.bLesson + '/theLessonManage',
+    url: api.bLesson + '/findLessonAtBanner',
     method: 'get',
     params: parameter
   });

src/views/courseTrain/onlineCourse/releaseCourse.vue

@@ -250,7 +250,7 @@
             window.addEventListener('scroll', this.handleScroll, true);
             // 查询所有课程分类初始化下拉选择
             queryCourse({ corpId: 1, userId: 1 }).then(res => {
-                console.log('queryCourse:',res);
+                console.log('queryCourse:', res);
                 this.courseIdTreeSelect = res.data.courseList;
                 this.getCoursesIdList(this.courseIdTreeSelect);
 

vue.config.js

@@ -111,7 +111,7 @@ module.exports = {
     port: 8000,
     proxy: {
       '/api': {
-        target: 'http://192.168.2.211:8081',
+        target: 'http://192.168.2.60:8081',
         changeOrigin: true,
         ws: true,
         pathRewrite: {