Merge branch 'feature/jq' into 'release'

Feature/jq

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!483

src/router/router.js

@@ -18,7 +18,8 @@ const editProfessionalExam = r => require.ensure([], () => r(require('../views/e
 const subjectManager = r => require.ensure([], () => r(require('../views/education/subject-manager.vue')), 'subject-manager')
 const editSubject = r => require.ensure([], () => r(require('../views/education/edit-subject.vue')), 'edit-subject')
 const reportDownload = r => require.ensure([], () => r(require('../views/education/report-download.vue')), 'report-download')
-
+const teachingPopup = r => require.ensure([], () => r(require('../views/education/teaching-popup.vue')), 'teaching-popup')
+const editeachPopup = r => require.ensure([], () => r(require('../views/education/editeach-popup.vue')), 'editeach-popup')
 
 import patientsRouters from './patients'
 import followRouters from './follow'
@@ -140,6 +141,14 @@ export default [
         path: "/report-download",
         component: reportDownload,
       },
+      {
+        path: "/teaching-popup",
+        component: teachingPopup,
+      },
+      {
+        path: "/editeach-popup",
+        component: editeachPopup,
+      },
       {
         path: "/edit-subject",
         component: editSubject,

src/utils-o/index.js

@@ -221,3 +221,7 @@ export function getExeclUrl(url) {
 export function getItemFileUrl(url) {
   return getConfigByEnvType('itemFileUrl') + url
 }
+// // 获取教培弹框url
+// export function getEdUrl() {
+//   return getConfigByEnvType('tEdUrl')
+// }
\ No newline at end of file

src/utils/env-config.js

@@ -42,6 +42,7 @@ export const envConfig = {
     stsUrl: "https://dev-api.yunqueyi.com/middle/oss/token/", //sts服务器
     bucketName: "pica-test-huabei2",
     endpoint: "oss-cn-beijing.aliyuncs.com",
+    tEdUrl:"https://dev-phome.yunqueyi.com/coopv2/#/previewActivityDialog"
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/',
@@ -64,6 +65,7 @@ export const envConfig = {
     stsUrl: "https://dev-api.yunqueyi.com/middle/oss/token/", //sts服务器
     bucketName: "pica-test-huabei2",
     endpoint: "oss-cn-beijing.aliyuncs.com",
+    tEdUrl:"https://dev-phome.yunqueyi.com/coopv2/#/previewActivityDialog"
   },
   test: {
     baseUrl: 'https://test1-sc.yunqueyi.com/',
@@ -86,6 +88,7 @@ export const envConfig = {
     stsUrl: "https://test1-api.yunqueyi.com/middle/oss/token/", //sts服务器
     bucketName: "pica-test-huabei2",
     endpoint: "oss-cn-beijing.aliyuncs.com",
+    tEdUrl:"https://test1-phome.yunqueyi.com/coopv2/#/previewActivityDialog"
   },
   test2: {
     baseUrl: 'https://test2-work.yunqueyi.com/sc/',
@@ -107,6 +110,7 @@ export const envConfig = {
     stsUrl: "https://test2-api.yunqueyi.com/middle/oss/token/", //sts服务器
     bucketName: "pica-test-huabei2",
     endpoint: "oss-cn-beijing.aliyuncs.com",
+    tEdUrl:"https://test1-phome.yunqueyi.com/coopv2/#/previewActivityDialog"
   },
   uat: {
     baseUrl: 'https://uat-sc.yunqueyi.com/',
@@ -129,6 +133,7 @@ export const envConfig = {
     stsUrl: "https://uat-api.yunqueyi.com/middle/oss/token/", //sts服务器
     bucketName: "pica-pro",
     endpoint: "oss-cn-shanghai.aliyuncs.com",
+    tEdUrl:"https://uat-phome.yunqueyi.com/coopv2/#/previewActivityDialog"
 },
   pro: {
     baseUrl: 'https://sc.yunqueyi.com/',
@@ -150,6 +155,7 @@ export const envConfig = {
     ossImgUrl: 'https://file.yunqueyi.com',
     stsUrl: "https://api.yunqueyi.com/middle/oss/token/", //sts服务器
     bucketName: "pica-pro",
-    endpoint: "oss-cn-shanghai.aliyuncs.com"
+    endpoint: "oss-cn-shanghai.aliyuncs.com",
+    tEdUrl:"https://phome.yunqueyi.com/coopv2/#/previewActivityDialog"
 }
 }

src/utils/index.js

@@ -250,7 +250,10 @@ export function getItemFileUrl(url) {
 export function getCmsUrl(url) {
   return getConfigByEnvType('cmsUrl') + url
 }
-
+// 获取教培弹框url
+export function getEdUrl() {
+  return getConfigByEnvType('tEdUrl')
+}
 
 
 // 转换时间格式