diff --git a/.env b/.env index 5afca6ef..c7f198b9 100644 --- a/.env +++ b/.env @@ -5,21 +5,21 @@ VUE_APP_BASE_API=/manageApi #文件路径 VUE_APP_FILE_PATH=/upload/ # 代理url 本地调试,不可以用在其他地方 -VUE_APP_PROXY_URL=http://43.143.139.204/manageApi +VUE_APP_PROXY_URL=//43.143.139.204/manageApi # 登录url -VUE_APP_LOGIN_URL=https://u-pre.boe.com/web +VUE_APP_LOGIN_URL=//u-pre.boe.com/web # boe域名 -VUE_APP_BOE_API_URL=https://u-pre.boe.com +VUE_APP_BOE_API_URL=//u-pre.boe.com #打包路径 VUE_APP_OUTPUT_DIR=./dist # iframe嵌套url -VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe +VUE_APP_IFRAME_URL=//u-pre.boe.com/pc/iframe # 学员端路由 -VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVUE_APP_BOE_API_URL +VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loading # 课程二维码 -VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id= +VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id= # 导入学员模板 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx diff --git a/.env.boe b/.env.boe index fdaf95b3..65a0c556 100644 --- a/.env.boe +++ b/.env.boe @@ -2,9 +2,9 @@ NODE_ENV=boe VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi -VUE_APP_LOGIN_URL=https://u-pre.boe.com/web +VUE_APP_LOGIN_URL=//u-pre.boe.com/web -VUE_APP_BOE_API_URL=https://u-pre.boe.com +VUE_APP_BOE_API_URL=//u-pre.boe.com # 导入学员模板 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx \ No newline at end of file diff --git a/.env.prod b/.env.prod index 3fc171f3..f7f9f813 100644 --- a/.env.prod +++ b/.env.prod @@ -2,15 +2,15 @@ NODE_ENV=prod VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi -VUE_APP_PROXY_URL=https://u.boe.com/ +VUE_APP_PROXY_URL=//u.boe.com/ -VUE_APP_LOGIN_URL=https://u.boe.com/web +VUE_APP_LOGIN_URL=//u.boe.com/web -VUE_APP_BOE_API_URL=https://u.boe.com +VUE_APP_BOE_API_URL=//u.boe.com -VUE_APP_IFRAME_URL=https://u.boe.com/pc/iframe -VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading +VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe +VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading -VUE_APP_COURSE_STUDY=https://u.boe.com/pc/course/studyindex?id= +VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id= VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx diff --git a/.env.release b/.env.release index 4870808f..55d0b0e4 100644 --- a/.env.release +++ b/.env.release @@ -2,15 +2,15 @@ NODE_ENV=release VUE_APP_BASE=/manage-release VUE_APP_BASE_API=/manageApi-release -VUE_APP_PROXY_URL=https://u-pre.boe.com/ -VUE_APP_LOGIN_URL=https://u.boe.com/web-release +VUE_APP_PROXY_URL=//u-pre.boe.com/ +VUE_APP_LOGIN_URL=//u.boe.com/web-release -VUE_APP_BOE_API_URL=https://u.boe.com +VUE_APP_BOE_API_URL=//u.boe.com -VUE_APP_IFRAME_URL=https://u.boe.com/pc-release/iframe -VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading +VUE_APP_IFRAME_URL=//u.boe.com/pc-release/iframe +VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc-release/loading -VUE_APP_COURSE_STUDY=https://u.boe.com/pc-release/course/studyindex?id= +VUE_APP_COURSE_STUDY=//u.boe.com/pc-release/course/studyindex?id= VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx \ No newline at end of file diff --git a/.env.test b/.env.test index 310c858d..8772bab7 100644 --- a/.env.test +++ b/.env.test @@ -1,2 +1,2 @@ NODE_ENV=test -VUE_APP_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file +VUE_APP_BOE_API_URL=//u-pre.boe.com \ No newline at end of file diff --git a/src/api/index1.js b/src/api/index1.js index 537ad5e5..bc903e8e 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -87,7 +87,8 @@ export const editLearnInfo = (obj) => http.post('/admin/router/editInfo', obj) //项目基础信息----------------------------------- //项目积分榜单 -export const scoreRank = (obj) => http.post("/admin/project/scoreRank", obj); +// export const scoreRank = (obj) => http.post("/admin/project/scoreRank", obj); +export const scoreRank = (params) => http.get('/points/top/list', { params }) //排行榜 export const billboard = (obj) => http.post("/admin/project/billboard", obj); //项目基础信息----------------------------------- diff --git a/src/api/method.js b/src/api/method.js index d4cd4a3a..f5826d2f 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -277,12 +277,12 @@ const commonData = { const organizationalTree = [] //嵌套页面 -const iframeUrl = process.env.VUE_APP_IFRAME_URL +const iframeUrl = window.location.protocol + process.env.VUE_APP_IFRAME_URL //学员端路由 -const studentUrl = process.env.VUE_APP_IFRAME_STUDENT_URL +const studentUrl = window.location.protocol + process.env.VUE_APP_IFRAME_STUDENT_URL //二维码 -const codeUrl = "https://u-pre.boe.com" +const codeUrl = window.location.protocol + "//u-pre.boe.com" export { throttle, toDate, diff --git a/src/api/request.js b/src/api/request.js index 54e2361d..ccd6697c 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -197,7 +197,7 @@ export async function boeRequest(_url, params) { } } const body = method !== 'get' ? params || {} : {} - url = process.env.NODE_ENV === 'development' ? url : process.env.VUE_APP_BOE_API_URL + url + url = process.env.NODE_ENV === 'development' ? url : window.location.protocol + process.env.VUE_APP_BOE_API_URL + url return fetch(url, { method, headers: { diff --git a/src/assets/images/taskpage/nocertificate.png b/src/assets/images/taskpage/nocertificate.png new file mode 100644 index 00000000..7e2e8169 Binary files /dev/null and b/src/assets/images/taskpage/nocertificate.png differ diff --git a/src/assets/images/taskpage/nocertificate2.png b/src/assets/images/taskpage/nocertificate2.png new file mode 100644 index 00000000..d0d4575c Binary files /dev/null and b/src/assets/images/taskpage/nocertificate2.png differ diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index d1d06503..6c05f4c3 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -81,7 +81,7 @@ const changeRole = (value) => { const logOut = () => { store.replaceState(createStore({state: {openpages: []}}).state); localStorage.clear(); - (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL) + (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: '/login'}) : (window.location.href = window.location.protocol + process.env.VUE_APP_LOGIN_URL) };