Merge branch 'dev-eduadmin-20190222' of...

Merge branch 'dev-eduadmin-20190222' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-eduadmin-20190222

src/App.vue

@@ -92,7 +92,7 @@ export default {
 			req = {
 				token: token
 			}
-			vm.GET('common/v1/role',req).then((res) => {
+			vm.GET('portal/common/v1/role',req).then((res) => {
 				if(res.code == '000000') {
 					vm.changeIdType(res.data.idType)
 					vm.idType = res.data.idType

src/utils/env-config.js

@@ -27,7 +27,7 @@ export const envConfig = {
     yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html'
   },
   test: {
-    baseUrl: 'https://test1-sc.yunqueyi.com/portal/',
+    baseUrl: 'https://test1-sc.yunqueyi.com/',
     qiniuFileUrl: "https://test1-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
     qiniuImgUrl: "https://test1-file.yunqueyi.com",
@@ -36,7 +36,7 @@ export const envConfig = {
     yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html'
   },
   uat: {
-    baseUrl: 'https://uat-sc.yunqueyi.com/portal/',
+    baseUrl: 'https://uat-sc.yunqueyi.com/',
     qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://videos.yunqueyi.com",  // 视频
     qiniuImgUrl: "https://file.yunqueyi.com",
@@ -45,7 +45,7 @@ export const envConfig = {
     yuequeyiIndexUrl: 'https://uat.yunqueyi.com/pica_index.html'
   },
   pro: {  
-    baseUrl: 'https://sc.yunqueyi.com/portal/',
+    baseUrl: 'https://sc.yunqueyi.com/',
     qiniuFileUrl: "https://sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://videos.yunqueyi.com",
     qiniuImgUrl: "https://file.yunqueyi.com",

src/views/education/item-component.vue

@@ -151,7 +151,7 @@ export default {
         search() {
             vm.searchParam.idType = vm.idType
             openLoading(vm)
-            vm.GET('portalComponent/queryPortalComponent',vm.searchParam).then((res) => {
+            vm.GET('portal/portalComponent/queryPortalComponent',vm.searchParam).then((res) => {
                 closeLoading(vm)
                 if( res.code == '000000' ) {
                     vm.tableData = res.data.queryList
@@ -180,7 +180,7 @@ export default {
                 token: vm._token,
                 componentId: row.id
             }
-            vm.GET('portalComponent/componentEditRange',req).then((res) => {
+            vm.GET('portal/portalComponent/componentEditRange',req).then((res) => {
                 if(res.code == "000000") {
                     vm.$router.push({path: 'create-component',query: {id:row.id,status: row.status,resultFlag: res.data.resultFlag}})
                 }
@@ -208,7 +208,7 @@ export default {
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-                    vm.GET('portalComponent/disableOrStart',req).then((res) => {
+                    vm.GET('portal/portalComponent/disableOrStart',req).then((res) => {
                         if(res.code == "000000") {
                             vm.$message({
                                 type: 'success',
@@ -239,7 +239,7 @@ export default {
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-                    vm.GET('portalComponent/deleteComponentById',{id: row.id}).then((res) => {
+                    vm.GET('portal/portalComponent/deleteComponentById',{id: row.id}).then((res) => {
                         if(res.code == "000000") {
                             vm.$message({
                                 type: 'success',

src/views/home.vue

@@ -83,7 +83,7 @@ export default {
         },
         // 获取系统消息数据
         getSystemData() {
-            vm.GET('portalMessage/queryPortalMessageInfo',{token: vm._token, pageNo: 1, pageSize: 15}).then((res) => {
+            vm.GET('portal/portalMessage/queryPortalMessageInfo',{token: vm._token, pageNo: 1, pageSize: 15}).then((res) => {
                 if( res.code == '000000') {
                     vm.messageList = res.data.portalMessageModels
                     vm.count = res.data.count