diff --git a/main.js b/main.js
index 8ddc59a..0617f9f 100644
--- a/main.js
+++ b/main.js
@@ -118,8 +118,13 @@ import commonVideoAliyun from '@/pages/component/commonComponents/video/AliPlaye
Vue.component('common-list-aliyun', commonVideoAliyun);
import commonVideoAudio from '@/pages/component/commonComponents/video/audio.vue'
Vue.component('common-list-audio', commonVideoAudio);
+
import commonVideo from '@/pages/component/commonComponents/video/index.vue'
Vue.component('common-video', commonVideo);
+
+import CommonCourseVideo from 'edu-core/components/course-video'
+Vue.component('CommonCourseVideo', CommonCourseVideo);
+
import commonCoupon from '@/pages/component/commonComponents/coupon/index.vue'
Vue.component('common-coupon', commonCoupon);
import commonGoodsList from '@/pages/component/commonComponents/goodsList.vue'
diff --git a/manifest.json b/manifest.json
index 6bc4f21..ac50263 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,8 +13,8 @@
"src" : "图片路径"
}
],
- "versionName" : "1.0.50",
- "versionCode" : 1050,
+ "versionName" : "1.0.51",
+ "versionCode" : 1051,
"app-plus" : {
"nvueCompiler" : "weex",
"compatible" : {
diff --git a/package-lock.json b/package-lock.json
index 96f23ed..74e0782 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,10 +9,12 @@
"version": "3.4.5",
"license": "MIT",
"dependencies": {
- "hls.js": "^1.5.13",
+ "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.3",
"jquery": "^3.7.1",
- "mui-player": "^1.8.1",
"tcplayer.js": "^5.1.0"
+ },
+ "devDependencies": {
+ "postcss-px-to-viewport": "^1.1.1"
}
},
"node_modules/babel-runtime": {
@@ -65,6 +67,11 @@
"resolved": "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz",
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
},
+ "node_modules/edu-core": {
+ "version": "1.0.0",
+ "resolved": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#3dc7f285266aeb5515d6ae1ce85962b4421748f6",
+ "license": "ISC"
+ },
"node_modules/es5-shim": {
"version": "4.6.7",
"resolved": "https://registry.npmmirror.com/es5-shim/-/es5-shim-4.6.7.tgz",
@@ -82,11 +89,6 @@
"process": "~0.5.1"
}
},
- "node_modules/hls.js": {
- "version": "1.5.13",
- "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.5.13.tgz",
- "integrity": "sha512-xRgKo84nsC7clEvSfIdgn/Tc0NOT+d7vdiL/wvkLO+0k0juc26NRBPPG1SfB8pd5bHXIjMW/F5VM8VYYkOYYdw=="
- },
"node_modules/individual": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/individual/-/individual-2.0.0.tgz",
@@ -130,10 +132,24 @@
"dom-walk": "^0.1.0"
}
},
- "node_modules/mui-player": {
- "version": "1.8.1",
- "resolved": "https://registry.npmmirror.com/mui-player/-/mui-player-1.8.1.tgz",
- "integrity": "sha512-5o0SnSyVImxT9XUO6jCMmcJ+ZyAEJeFvdeZDHHPNS/LdwhzWX4yQPNgx8nzRbcUJ749xpqEQ6uVddiexLyvvqg=="
+ "node_modules/nanoid": {
+ "version": "3.3.11",
+ "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
+ "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
},
"node_modules/object-assign": {
"version": "4.1.1",
@@ -148,6 +164,53 @@
"resolved": "https://registry.npmmirror.com/parse-headers/-/parse-headers-2.0.5.tgz",
"integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA=="
},
+ "node_modules/picocolors": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+ "dev": true,
+ "license": "ISC"
+ },
+ "node_modules/postcss": {
+ "version": "8.5.6",
+ "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.6.tgz",
+ "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "nanoid": "^3.3.11",
+ "picocolors": "^1.1.1",
+ "source-map-js": "^1.2.1"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ }
+ },
+ "node_modules/postcss-px-to-viewport": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmmirror.com/postcss-px-to-viewport/-/postcss-px-to-viewport-1.1.1.tgz",
+ "integrity": "sha512-2x9oGnBms+e0cYtBJOZdlwrFg/mLR4P1g2IFu7jYKvnqnH/HLhoKyareW2Q/x4sg0BgklHlP1qeWo2oCyPm8FQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "object-assign": ">=4.0.1",
+ "postcss": ">=5.0.2"
+ }
+ },
"node_modules/process": {
"version": "0.5.2",
"resolved": "https://registry.npmmirror.com/process/-/process-0.5.2.tgz",
@@ -190,6 +253,16 @@
"rust-result": "^1.0.0"
}
},
+ "node_modules/source-map-js": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/store": {
"version": "2.0.12",
"resolved": "https://registry.npmmirror.com/store/-/store-2.0.12.tgz",
@@ -319,6 +392,10 @@
"resolved": "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz",
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
},
+ "edu-core": {
+ "version": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#3dc7f285266aeb5515d6ae1ce85962b4421748f6",
+ "from": "edu-core@git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.3"
+ },
"es5-shim": {
"version": "4.6.7",
"resolved": "https://registry.npmmirror.com/es5-shim/-/es5-shim-4.6.7.tgz",
@@ -333,11 +410,6 @@
"process": "~0.5.1"
}
},
- "hls.js": {
- "version": "1.5.13",
- "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.5.13.tgz",
- "integrity": "sha512-xRgKo84nsC7clEvSfIdgn/Tc0NOT+d7vdiL/wvkLO+0k0juc26NRBPPG1SfB8pd5bHXIjMW/F5VM8VYYkOYYdw=="
- },
"individual": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/individual/-/individual-2.0.0.tgz",
@@ -381,10 +453,11 @@
"dom-walk": "^0.1.0"
}
},
- "mui-player": {
- "version": "1.8.1",
- "resolved": "https://registry.npmmirror.com/mui-player/-/mui-player-1.8.1.tgz",
- "integrity": "sha512-5o0SnSyVImxT9XUO6jCMmcJ+ZyAEJeFvdeZDHHPNS/LdwhzWX4yQPNgx8nzRbcUJ749xpqEQ6uVddiexLyvvqg=="
+ "nanoid": {
+ "version": "3.3.11",
+ "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
+ "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -396,6 +469,33 @@
"resolved": "https://registry.npmmirror.com/parse-headers/-/parse-headers-2.0.5.tgz",
"integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA=="
},
+ "picocolors": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+ "dev": true
+ },
+ "postcss": {
+ "version": "8.5.6",
+ "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.6.tgz",
+ "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+ "dev": true,
+ "requires": {
+ "nanoid": "^3.3.11",
+ "picocolors": "^1.1.1",
+ "source-map-js": "^1.2.1"
+ }
+ },
+ "postcss-px-to-viewport": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmmirror.com/postcss-px-to-viewport/-/postcss-px-to-viewport-1.1.1.tgz",
+ "integrity": "sha512-2x9oGnBms+e0cYtBJOZdlwrFg/mLR4P1g2IFu7jYKvnqnH/HLhoKyareW2Q/x4sg0BgklHlP1qeWo2oCyPm8FQ==",
+ "dev": true,
+ "requires": {
+ "object-assign": ">=4.0.1",
+ "postcss": ">=5.0.2"
+ }
+ },
"process": {
"version": "0.5.2",
"resolved": "https://registry.npmmirror.com/process/-/process-0.5.2.tgz",
@@ -432,6 +532,12 @@
"rust-result": "^1.0.0"
}
},
+ "source-map-js": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+ "dev": true
+ },
"store": {
"version": "2.0.12",
"resolved": "https://registry.npmmirror.com/store/-/store-2.0.12.tgz",
diff --git a/package.json b/package.json
index e27efa9..e118fe4 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
},
"homepage": "https://github.com/dcloudio/hello-uniapp#readme",
"dependencies": {
+ "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.3",
"jquery": "^3.7.1",
"tcplayer.js": "^5.1.0"
},
diff --git a/pages/curriculum/order/curriculum/detail.vue b/pages/curriculum/order/curriculum/detail.vue
index e6c9a0a..162595b 100644
--- a/pages/curriculum/order/curriculum/detail.vue
+++ b/pages/curriculum/order/curriculum/detail.vue
@@ -9,215 +9,36 @@
isFullScreen ? 'background:#000' : ''
}`"
>
-
-
-
-
-
+
-
- 课程：{{ options.navTitle }}
-
-
- 章节： {{ curriculumData.title }}
-
- 视频教学
-
-
-
-
-
- 文章简介
-
-
-
-
-
-
-
- 本课程版权归天津众妙之门科技有限公司所有，翻版必究!
-
-
-
+ 文章简介
+
+
+
+
+
+
+
+ 本课程版权归天津众妙之门科技有限公司所有，翻版必究!
+
+
+
@@ -349,66 +170,6 @@ export default {
},
},
methods: {
- changeScreenLoading(status) {
- this.screenLoading = status;
- },
- changeScreen(status) {
- this.isFullScreen = status;
- },
- ordersTabCLi(data) {
- console.log("i at line 312:", data);
- this.currentCateIndex = data.index;
- this.$forceUpdate();
- },
- handleFresh(status) {
- this.isfresh = status;
- // this.currentVideoId = this.currentSelectVideoId;
- // console.log("this.currentVideoId", this.currentVideoId);
- this.$forceUpdate();
- },
- changeVideo(data) {
- if (data.id != this.currentVideo.id) {
- this.isfresh = false;
- this.$nextTick(() => {
- // this.$refs.commonVideo.destory();
- // if (data.id != this.currentVideoId) {
- this.currentVideo = data;
- this.currentVideoId = data.id;
-
- this.isfresh = true;
- // }
- });
- }
- },
- hancleModalCancel() {
- this.show = false;
- },
- handleClickMore(v, i, status) {
- this.$set(this.correlationiList[i], "isOpen", status);
- },
- hancleModalConfirm() {
- var data = {
- values: {
- customerType: "D",
- token: uni.getStorageSync("token"),
- customerOid: uni.getStorageSync("customerOid"),
- ...this.taiHuClassInfo,
- },
- };
- },
-
- //课程详情
- gotoDetail(v) {
- uni.navigateTo({
- url: `/pages/curriculum/order/curriculum/detail?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`,
- });
- },
- //相关课程
- goCourseDescription(v) {
- uni.navigateTo({
- url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&id=${v.id}`,
- });
- },
async getCourseDescriptionData() {
this.isfresh = false;
var data = {
@@ -436,87 +197,6 @@ export default {
}
});
},
- getPriceData() {
- var that = this;
- setTimeout(() => {
- that.$nextTick(() => {
- that.$refs.priceDetail.getData();
- });
- }, 100);
- },
- // 检查是有权限使用搜索功能
- checkDisable() {},
-
- // 获取用户详情
- getUserInfo() {
- // 用户详情
- if (this.userInfo.id != undefined) {
- this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
- this.userMes = res.user;
- this.getCateList();
- });
- }
- },
-
- async handleselectCate(item, index) {
- this.dataList = [];
- var data = [];
-
- var that = this;
- this.$http
- .post(this.urlList.curriculumInfo, {
- customerType: "D",
- token: uni.getStorageSync("token"),
- customerOid: uni.getStorageSync("customerOid"),
- oid: item.coid,
- })
- .then(async (res) => {
- that.curriculumInfo = res.obj;
- that.dataList = res.obj.courseList;
-
- // socket.init();
- });
-
- this.searchValue = "";
- this.searchList = [];
- this.showSearchList = false;
-
- return data;
- },
- async setOneCateIndex(item, index) {
- this.allDataList = [];
-
- var that = this;
-
- this.currentStatusIndex = index;
- this.searchValue = "";
- this.searchList = [];
- this.showSearchList = false;
- this.$nextTick(async () => {
- await that.getCourseDescriptionData();
- this.$forceUpdate();
- });
- },
-
- transformData(inputData) {
- const result = {};
- inputData.forEach((item) => {
- const { letter } = item;
- if (!result[letter]) {
- result[letter] = [];
- }
- result[letter].push(item);
- });
- // const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
- return result;
- },
-
- getCateList(id) {
- id ? "" : (id = 0);
- this.twoCateList = [];
- this.curTwoCateIndex = 0;
- },
-
// 放大图片
previewImage(url) {
uni.previewImage({
@@ -876,11 +556,23 @@ export default {
.related_courses_name {
display: inline-block;
width: calc(100% - 150rpx) !important;
-
- .aui-text-danger {
- display: inline-block;
- float: right;
- }
+}
+.copyright {
+ .aui-text-danger {
+ position: fixed;
+ z-index: 99;
+ width: 100%;
+ bottom: 0;
+ left: 0;
+ height: 40px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background-color: #F8F9FA;
+ }
+ .place-height {
+ height: 40px;
+ }
}
.curriculum_box {