diff --git a/.env.preview b/.env.preview index cd3581a0..b7f210ca 100644 --- a/.env.preview +++ b/.env.preview @@ -9,6 +9,12 @@ VUE_APP_BASE_API = '/systemapi-release' # BOE管理系统/开发环境 VUE_APP_BOE_BASE_API = '/uboeApi-release' +# 资源位的api +VUE_APP_CESOURCE_BASE_API = '/socialApi' + +# 事件的api +VUE_APP_STAT_BASE_API = '/statApi' + # BOE系统网址,已经不再使用 VUE_APP_BOE_WEB_URL = 'https://u.boe.com/preview' diff --git a/.env.production b/.env.production index 331b4205..763a725e 100644 --- a/.env.production +++ b/.env.production @@ -9,14 +9,20 @@ VUE_APP_BASE_API = '/systemapi' # BOE管理系统/开发环境 VUE_APP_BOE_BASE_API = '/uboeApi' +# 资源位的api +VUE_APP_CESOURCE_BASE_API = '/socialApi' + +# 事件的api +VUE_APP_STAT_BASE_API = '/statApi' + # BOE系统网址 -VUE_APP_BOE_WEB_URL = 'https://u.boe.com/production' +VUE_APP_BOE_WEB_URL = 'https://u.boe.com' # BOE 移动端url VUE_APP_BOE_MOBILE_URL = 'http://u.boe.com' # File路径的基础url -VUE_APP_FILE_BASE_URL='http://u-pre.boe.com/upload' +VUE_APP_FILE_BASE_URL='http://u.boe.com/upload' # File路径的基础url的相对路径,加此项是为了不影响之前的路径配置 VUE_APP_FILE_RELATIVE_PATH = '/upload' @@ -25,4 +31,4 @@ VUE_APP_FILE_RELATIVE_PATH = '/upload' VUE_APP_PUBLIC_PATH='/pc' # 登录地址 -VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/' +VUE_APP_LOGIN_URL='https://u.boe.com/web/' diff --git a/.env.testing b/.env.testing index 89063e98..a0aa5726 100644 --- a/.env.testing +++ b/.env.testing @@ -9,14 +9,20 @@ VUE_APP_BASE_API = '/systemapi' # BOE管理系统/开发环境 VUE_APP_BOE_BASE_API = '/uboeApi' +# 资源位的api +VUE_APP_CESOURCE_BASE_API = '/socialApi' + +# 事件的api +VUE_APP_STAT_BASE_API = '/statApi' + # BOE系统网址 -VUE_APP_BOE_WEB_URL = 'https://u-pre.boe.com/testing' +VUE_APP_BOE_WEB_URL = 'https://u-pre.boe.com' # BOE 移动端url -VUE_APP_BOE_MOBILE_URL = 'http://u-pre.boe.com' +VUE_APP_BOE_MOBILE_URL = 'https://u-pre.boe.com' # File路径的基础url -VUE_APP_FILE_BASE_URL='http://u-pre.boe.com/upload' +VUE_APP_FILE_BASE_URL='https://u-pre.boe.com/upload' # File路径的基础url的相对路径,加此项是为了不影响之前的路径配置 VUE_APP_FILE_RELATIVE_PATH = '/upload' diff --git a/package-lock.json b/package-lock.json index 813d2b41..e58bb672 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1249,6 +1249,29 @@ "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==", "dev": true }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + } + } + }, "@jridgewell/sourcemap-codec": { "version": "1.4.13", "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", @@ -1421,6 +1444,12 @@ "@types/node": "*" } }, + "@types/html-minifier-terser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", + "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", + "dev": true + }, "@types/http-proxy": { "version": "1.17.9", "resolved": "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.9.tgz", @@ -3107,6 +3136,16 @@ "integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==", "dev": true }, + "camel-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "dev": true, + "requires": { + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + } + }, "camelcase": { "version": "6.3.0", "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz", @@ -4595,6 +4634,16 @@ "domhandler": "^4.2.0" } }, + "dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "dev": true, + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", @@ -6277,12 +6326,114 @@ } } }, + "html-minifier-terser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", + "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", + "dev": true, + "requires": { + "camel-case": "^4.1.2", + "clean-css": "^5.2.2", + "commander": "^8.3.0", + "he": "^1.2.0", + "param-case": "^3.0.4", + "relateurl": "^0.2.7", + "terser": "^5.10.0" + }, + "dependencies": { + "acorn": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "dev": true + }, + "clean-css": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz", + "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==", + "dev": true, + "requires": { + "source-map": "~0.6.0" + } + }, + "commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "dev": true + }, + "terser": { + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", + "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "dev": true, + "requires": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + } + } + } + } + }, "html-tags": { "version": "3.2.0", "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.2.0.tgz", "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==", "dev": true }, + "html-webpack-plugin": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz", + "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==", + "dev": true, + "requires": { + "@types/html-minifier-terser": "^6.0.0", + "html-minifier-terser": "^6.0.2", + "lodash": "^4.17.21", + "pretty-error": "^4.0.0", + "tapable": "^2.0.0" + }, + "dependencies": { + "pretty-error": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", + "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", + "dev": true, + "requires": { + "lodash": "^4.17.20", + "renderkid": "^3.0.0" + } + }, + "renderkid": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", + "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", + "dev": true, + "requires": { + "css-select": "^4.1.3", + "dom-converter": "^0.2.0", + "htmlparser2": "^6.1.0", + "lodash": "^4.17.21", + "strip-ansi": "^6.0.1" + } + }, + "tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true + } + } + }, "htmlparser2": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", @@ -7484,6 +7635,15 @@ "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==", "dev": true }, + "lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dev": true, + "requires": { + "tslib": "^2.0.3" + } + }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -7936,6 +8096,16 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dev": true, + "requires": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, "node-forge": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", @@ -8445,6 +8615,16 @@ "readable-stream": "^2.1.5" } }, + "param-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", + "dev": true, + "requires": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "parchment": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz", @@ -8525,6 +8705,16 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, + "pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "dev": true, + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", diff --git a/package.json b/package.json index 20db58f5..bb05de8e 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "babel-eslint": "^10.1.0", "eslint": "^6.7.2", "eslint-plugin-vue": "^6.2.2", + "html-webpack-plugin": "^5.5.0", "less": "^4.1.1", "less-loader": "^6.2.0", "sass": "^1.32.13", diff --git a/public/images/nocase.png b/public/images/nocase.png new file mode 100644 index 00000000..c7b05176 Binary files /dev/null and b/public/images/nocase.png differ diff --git a/public/images/nocouresimg.png b/public/images/nocouresimg.png new file mode 100644 index 00000000..19d5224b Binary files /dev/null and b/public/images/nocouresimg.png differ diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 688e8336..ed4a3073 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -460,7 +460,7 @@ margin-right: 20px; margin-bottom: 20px; - .course-image-box{ + .xindex-course-image{ width: 220px; height: 123px; ::v-deep .course-image{ @@ -472,7 +472,7 @@ margin-top:15px; } .xindex-ranking-course{ - height: 460px; + height: 465px; } .xindex-ranking-case{ @@ -690,9 +690,9 @@ padding: 25px; margin-right: 20px; margin-bottom: 20px; - .course-image-box{ + .xindex-course-image{ width: 280px; - height: 100px; + height: 156px; ::v-deep .course-image{ height: 100% !important; } @@ -703,7 +703,7 @@ margin-top:20px; } .xindex-ranking-course{ - height: 532px; + height: 530px; } .xindex-ranking-case{ @@ -915,9 +915,9 @@ margin-bottom: 30px; border-radius: 8px; - .course-image-box{ + .xindex-course-image{ width: 340px; - height: 191x; + height: 191px; ::v-deep .course-image{ height: 100% !important; } @@ -927,7 +927,7 @@ margin-top:30px; } .xindex-ranking-course{ - height: 646px; + height: 616px; } .xindex-ranking-case{ @@ -1135,7 +1135,7 @@ margin-right: 36px; margin-bottom: 36px; border-radius: 8px; - .course-image-box{ + .xindex-course-image{ width: 350px; height: 196x; ::v-deep .course-image{ diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index f78f3d35..4050cca0 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -118,18 +118,18 @@ body {margin: 0px;padding: 0px;} //排行块的背景 .ranking-bg{ - background: url('/images/qa-box.png') no-repeat top left; + background: url('../../../public/images/qa-box.png') no-repeat top left; // background: linear-gradient(180deg, #C3DEF8 0%, #FFFFFF 37%); //background-size:100% 100%; background-size:cover; } .ranking-bg1{ - background: url('/images/list-or.png') no-repeat top left; + background: url('../../../public/images/list-or.png') no-repeat top left; //background-size:100% 100%; background-size:cover; } .ranking-bg2{ - background: url('/images/list-pink.png') no-repeat top left; + background: url('../../../public/images/list-pink.png') no-repeat top left; //background-size:100% 100%; background-size:cover; } diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue index 5550ee6c..dc63847c 100644 --- a/src/components/Course/myNote.vue +++ b/src/components/Course/myNote.vue @@ -8,9 +8,9 @@
- + {{formatSeconds(mynoteData.playTime)}} - +
- + {{formatSeconds(note.playTime)}}
@@ -56,7 +56,7 @@
已经到底啦
- +
你还没有记录此课程的笔记哦~
@@ -68,9 +68,9 @@

- + {{formatSeconds(mynoteData.playTime)}} - +
- 视频位置 公开 私密 @@ -92,7 +92,7 @@
- {{inAnimationText}} + {{inAnimationText}}
diff --git a/src/components/HomePage/answerList.vue b/src/components/HomePage/answerList.vue index d91990a2..667e3691 100644 --- a/src/components/HomePage/answerList.vue +++ b/src/components/HomePage/answerList.vue @@ -26,7 +26,7 @@
- +

还没有回答

diff --git a/src/components/HomePage/articleList.vue b/src/components/HomePage/articleList.vue index 7eaa8d66..47057a4c 100644 --- a/src/components/HomePage/articleList.vue +++ b/src/components/HomePage/articleList.vue @@ -30,7 +30,7 @@
- +

还没有笔记

diff --git a/src/components/HomePage/bookList.vue b/src/components/HomePage/bookList.vue index 29838805..b89a41b7 100644 --- a/src/components/HomePage/bookList.vue +++ b/src/components/HomePage/bookList.vue @@ -23,7 +23,7 @@
- +

还没有书籍

diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue index 302bc1ac..a6f9ee00 100644 --- a/src/components/HomePage/caseList.vue +++ b/src/components/HomePage/caseList.vue @@ -22,8 +22,9 @@ -
+
+
{{ item.authorInfo.sign }}
{{ orgDomainTranslate(item.info.orgDomain) }}
@@ -51,7 +52,7 @@
- +

还没有案例

@@ -66,7 +67,7 @@ components: { interactBar, // timeShow, - author + author }, computed: { ...mapGetters(['userInfo','majorTypeMap','orgDomainMap']), @@ -91,6 +92,7 @@ } }, mounted() { + }, methods:{ emitHide(id) { @@ -119,6 +121,12 @@